diff --git a/.tx/config b/.tx/config
index c3c2862545a01ee8fe3a1e0edaf4196f9d84c63b..884e24bdf20674460281b98521557d1257c2ae4f 100644
--- a/.tx/config
+++ b/.tx/config
@@ -635,6 +635,9 @@ trans.zh_CN = installer/resources/eepsite/docroot/help/index_zh.html
 ;;
 ;; Text on /console
 ;;
+;; NOTE: No support for country suffixes right now.
+;; See ResourceHelper.java
+;;
 type = HTML
 source_file = apps/routerconsole/resources/docs/readme.html
 source_lang = en
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ResourceHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ResourceHelper.java
index dd6abbeefa4d8f13cab80205c089d41bd636aac7..490a3abc71510959efef1efa82492ffed2f0bee3 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ResourceHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ResourceHelper.java
@@ -48,18 +48,19 @@ public class ResourceHelper extends HelperBase {
         if (lastdot <= 0) {
             page = _page;
         } else {
-            if (_context != null)
-                lang = _context.getProperty(Messages.PROP_LANG);
-            if (lang == null || lang.length() <= 0) {
-                lang = Locale.getDefault().getLanguage();
-                if (lang == null || lang.length() <= 0)
-                    page = _page;
-            }
+            lang = Messages.getLanguage(_context);
         }
         if (page == null) {
             if (lang.equals("en"))
                 page = _page;
             else
+                // TODO no country support or fallback to non-country
+                // right now zh_TW is the only one, and is identical to zh
+                // if (lang.equals("zh")) {
+                //     String country = Messages.getCountry();
+                //     if (country.equals("TW"))
+                //         lang = "zh_TW";
+                // }
                 page = _page.substring(0, lastdot) + '_' + lang + _page.substring(lastdot);
         }
         InputStream is = ResourceHelper.class.getResourceAsStream("/net/i2p/router/web/resources/" + page);