marek/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Console: Add TODOs for country variants of readme files

Browse Source 
Clean up language selection code in ResourceHelper
This commit is contained in:
zzz
2022-05-27 11:59:49 -04:00
parent 86996dde28
commit 17cc514bb1
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.tx/config
View File

@ -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

15
apps/routerconsole/java/src/net/i2p/router/web/helpers/ResourceHelper.java
View File

@ -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);