I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Unverified Commit 17cc514b authored by zzz's avatar zzz
Browse files

Console: Add TODOs for country variants of readme files

Clean up language selection code in ResourceHelper
parent 86996dde
No related branches found
No related tags found
No related merge requests found
...@@ -635,6 +635,9 @@ trans.zh_CN = installer/resources/eepsite/docroot/help/index_zh.html ...@@ -635,6 +635,9 @@ trans.zh_CN = installer/resources/eepsite/docroot/help/index_zh.html
;; ;;
;; Text on /console ;; Text on /console
;; ;;
;; NOTE: No support for country suffixes right now.
;; See ResourceHelper.java
;;
type = HTML type = HTML
source_file = apps/routerconsole/resources/docs/readme.html source_file = apps/routerconsole/resources/docs/readme.html
source_lang = en source_lang = en
......
...@@ -48,18 +48,19 @@ public class ResourceHelper extends HelperBase { ...@@ -48,18 +48,19 @@ public class ResourceHelper extends HelperBase {
if (lastdot <= 0) { if (lastdot <= 0) {
page = _page; page = _page;
} else { } else {
if (_context != null) lang = Messages.getLanguage(_context);
lang = _context.getProperty(Messages.PROP_LANG);
if (lang == null || lang.length() <= 0) {
lang = Locale.getDefault().getLanguage();
if (lang == null || lang.length() <= 0)
page = _page;
}
} }
if (page == null) { if (page == null) {
if (lang.equals("en")) if (lang.equals("en"))
page = _page; page = _page;
else 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); page = _page.substring(0, lastdot) + '_' + lang + _page.substring(lastdot);
} }
InputStream is = ResourceHelper.class.getResourceAsStream("/net/i2p/router/web/resources/" + page); InputStream is = ResourceHelper.class.getResourceAsStream("/net/i2p/router/web/resources/" + page);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment