locale: fix the locale selection for JS

tvheadend · Jun 23, 2015 · 1e7eca9 · 1e7eca9
1 parent cbef6f2
commit 1e7eca9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 19 deletions.
diff --git a/src/tvh_locale.c b/src/tvh_locale.c
@@ -37,8 +37,10 @@ const char *tvh_gettext_default_lang = NULL;
 const char *tvh_gettext_last_lang = NULL;
 const char **tvh_gettext_last_strings = NULL;
 
-static const char *tvh_gettext_lang_check(const char *lang)
+const char *tvh_gettext_get_lang(const char *lang)
 {
+  if (lang == NULL || lang[0] == '\0')
+    return "en";
   if (!strcmp(lang, "eng_US"))
     return "en";
   if (!strcmp(lang, "eng_GB"))
@@ -128,7 +130,7 @@ const char *tvh_gettext_lang(const char *lang, const char *s)
       tvh_gettext_init();
     lang = tvh_gettext_default_lang;
   } else {
-    lang = tvh_gettext_lang_check(lang);
+    lang = tvh_gettext_get_lang(lang);
   }
   if (tvh_gettext_last_lang == NULL || strcmp(tvh_gettext_last_lang, lang)) {
     tvh_gettext_new_lang(lang);

diff --git a/src/tvh_locale.h b/src/tvh_locale.h
@@ -18,6 +18,7 @@
 #ifndef __TVH_LOCALE_H__
 #define __TVH_LOCALE_H__
 
+const char *tvh_gettext_get_lang(const char *lang);
 const char *tvh_gettext_lang(const char *lang, const char *s);
 static inline const char *tvh_gettext(const char *s)
   { return tvh_gettext_lang(NULL, s); }

diff --git a/src/webui/webui.c b/src/webui/webui.c
@@ -1402,21 +1402,6 @@ favicon(http_connection_t *hc, const char *remain, void *opaque)
   return 0;
 }
 
-/**
- *
- */
-static const char *http_locale_lang(http_connection_t *hc)
-{
-  const char *s = hc->hc_access->aa_lang;
-  if (s && s[0]) {
-    const lang_code_t *lc;
-    lc = lang_code_get3(s);
-    if (strcmp(lc->code2b, "und"))
-      return lc->code1;
-  }
-  return NULL;
-}
-
 /**
  *
  */
@@ -1449,7 +1434,7 @@ http_redir(http_connection_t *hc, const char *remain, void *opaque)
 
   if (nc == 1) {
     if (!strcmp(components[0], "locale.js")) {
-      lang = http_locale_lang(hc);
+      lang = tvh_gettext_get_lang(hc->hc_access->aa_lang);
       if (lang) {
         snprintf(buf, sizeof(buf), "src/webui/static/intl/tvh.%s.js.gz", lang);
         if (!http_file_test(buf)) {
@@ -1467,7 +1452,7 @@ http_redir(http_connection_t *hc, const char *remain, void *opaque)
 
   if (nc >= 2) {
     if (!strcmp(components[0], "docs")) {
-      lang = http_locale_lang(hc);
+      lang = tvh_gettext_get_lang(hc->hc_access->aa_lang);
       snprintf(buf, sizeof(buf), "docs/html/%s/%s%s%s", lang, components[1],
                                  nc > 2 ? "/" : "", nc > 2 ? components[1] : "");
       if (http_file_test(buf)) lang = "en";