From 17cc514bb15ef2610a2e5098b67191ae17c5d41b Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Fri, 27 May 2022 11:59:49 -0400
Subject: [PATCH] Console: Add TODOs for country variants of readme files
Clean up language selection code in ResourceHelper
---
.tx/config | 3 +++
.../i2p/router/web/helpers/ResourceHelper.java | 15 ++++++++-------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/.tx/config b/.tx/config
index c3c2862545..884e24bdf2 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 dd6abbeefa..490a3abc71 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);
--
GitLab