refactored localization logic

Author: suewonjp

src/main/java/com/civilizer/config/Configurator.java

@@ -75,9 +75,11 @@ private static Locale getLocaleByName(String name) {
     }
 
     public static Locale resolveLocale(Locale localeFromClient) {
+        // A locale setting specified via application options (e.g. app-options.properties)
         final String localeFromAppOption = System.getProperty(AppOptions.LOCALE);
         Locale locale = getLocaleByName(localeFromAppOption);
         if (locale == null) {
+            // Or we use a locale setting from client (e.g. cookie)
             assert localeFromAppOption != null;
             locale = localeFromClient;
         }

src/main/java/com/civilizer/web/controller/MainController.java

@@ -951,9 +951,9 @@ public String onRequestForFragment(ModelMap model, @PathVariable Long fragmentId
     }
 
     @RequestMapping(value = "/fragment/help", method = { RequestMethod.GET })
-    public String onRequestForFragment(ModelMap model, HttpServletRequest req) {
-        final String title = ViewUtil.getHelpString("help_title", req);
-        final String content = ViewUtil.getHelpString("help_content", req);
+    public String onRequestForFragment(ModelMap model) {
+        final String title = ViewUtil.getHelpString("help_title");
+        final String content = ViewUtil.getHelpString("help_content");
         final Fragment frg = new Fragment(title, content, null);
         model.addAttribute("fragmentType", "app-help-fragment");
         return onRequestForFragment(model, frg);

src/main/java/com/civilizer/web/view/ViewUtil.java

@@ -74,22 +74,13 @@ public static void setLocale(RequestContext rc) {
     }
 
 	public static String getResourceBundleString(String key) {
-	    Locale locale;
-	    final RequestContext rc = RequestContextHolder.getRequestContext();
-	    if (rc == null) {
-            locale = new Locale(System.getProperty(AppOptions.CUR_LOCALE));
-        }
-	    else {
-	        final ServletExternalContext ec = (ServletExternalContext)rc.getExternalContext();
-	        final HttpServletRequest req = (HttpServletRequest)ec.getNativeRequest();
-	        locale = RequestContextUtils.getLocale(req); // Retrieve the locale info from the cookie
-	    }
+	    final Locale locale = Configurator.getCurLocale();
         final ResourceBundle bundle = ResourceBundle.getBundle(MESSAGE_RESOURCE_BASE_NAME, locale);
         return bundle.getString(key);
 	}
 
-	public static String getHelpString(String key, HttpServletRequest req) {
-        final Locale locale = RequestContextUtils.getLocale(req);
+	public static String getHelpString(String key) {
+	    final Locale locale = Configurator.getCurLocale();
 	    final ResourceBundle bundle = ResourceBundle.getBundle(HELP_RESOURCE_BASE_NAME, locale);
 	    return bundle.getString(key);
 	}

src/main/resources/i18n/MessageResources_en.properties

@@ -118,6 +118,7 @@ close_others=Close Others
 support_cvz=Do you think Civilizer is useful for you? Then, please, support Civilizer
 remember_fragments=Remember These Fragments?
 reminder_interval=Reminder Interval
+no_locale_dlg=You've set locale via app-options.properties or similar means. This dialog is not available in that case.
 
 # format patterns
 date_time_format=YYYY-MM-dd HH:mm

src/main/resources/i18n/MessageResources_ja.properties

@@ -118,6 +118,7 @@ close_others=\u4ed6\u3092\u9589\u3058\u308b
 support_cvz=\u30b7\u30d3\u30e9\u30a4\u30b6\u30fc\u304c\u3082\u3063\u3068\u5f79\u306b\u7acb\u3064\u3088\u3046\u5fdc\u63f4\u3057\u3066\u304f\u3060\u3055\u3044\uff0e
 remember_fragments=\u3053\u308c\u3089\u306e\u30d5\u30e9\u30b0\u30e1\u30f3\u30c8\u3092\u899a\u3048\u3066\u3044\u307e\u3059\u304b?
 reminder_interval=\u30ea\u30de\u30a4\u30f3\u30c9\u306e\u767a\u751f\u5468\u671f
+no_locale_dlg=app-options.properties\u30D5\u30A1\u30A4\u30EB\u7D4C\u7531\u306A\u3069\u3067\u30ED\u30B1\u30FC\u30EB\u3092\u8A2D\u5B9A\u3057\u307E\u3057\u305F\uFF0E\u305D\u306E\u5834\u5408\uFF0C\u3053\u306E\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u5229\u7528\u3059\u308B\u3053\u3068\u306F\u51FA\u6765\u307E\u305B\u3093\uFF0E
 
 # format patterns
 date_time_format=YYYY-MM-dd HH:mm

src/main/webapp/WEB-INF/flows/home/home.xhtml

@@ -178,14 +178,23 @@
     <p:dialog widgetVar="localeSettingsDlg" header="#{msg['change_locale']}"
         width="440px" modal="true" closeOnEscape="true" showEffect="fade" position="center" draggable="true" resizable="false">
 
-        <p:panel>
-            <span value="en" class="locale-item-btn fa fa-flag">#{msg['locale_en']}</span>
-            <span value="ja" class="locale-item-btn fa fa-flag">#{msg['locale_ja']}</span>
-<!--             <span value="ko" class="locale-item-btn fa fa-flag">#{msg['locale_ko']}</span> -->
-        </p:panel>
+        <c:choose>
+            <c:when test="#{not empty systemProperties['civilizer.locale']}">
+                <p:panel>
+                    <h:outputText value="#{msg['no_locale_dlg']}" />
+                </p:panel>
+            </c:when>
+            <c:otherwise>
+                <p:panel>
+                    <span value="en" class="locale-item-btn fa fa-flag">#{msg['locale_en']}</span>
+                    <span value="ja" class="locale-item-btn fa fa-flag">#{msg['locale_ja']}</span>
+        <!--             <span value="ko" class="locale-item-btn fa fa-flag">#{msg['locale_ko']}</span> -->
+                </p:panel>
 
-        <p:commandButton onclick="LSC.onClickApply()" value="#{msg['ok']}" icon="ui-icon-check"/>
-        <p:commandButton onclick="LSC.onClickCancel()" value="#{msg['cancel']}" icon="ui-icon-close"/>
+                <p:commandButton onclick="LSC.onClickApply()" value="#{msg['ok']}" icon="ui-icon-check"/>
+                <p:commandButton onclick="LSC.onClickCancel()" value="#{msg['cancel']}" icon="ui-icon-close"/>
+            </c:otherwise>
+        </c:choose>
     </p:dialog>
 </h:form>