WEBUI: fix the default ui language handling, fixes #3097

src/access.c

@@ -31,6 +31,7 @@
 #include <sys/socket.h>
 
 #include "tvheadend.h"
+#include "config.h"
 #include "access.h"
 #include "settings.h"
 #include "channels.h"
@@ -495,6 +496,7 @@ static void
 access_update(access_t *a, access_entry_t *ae)
 {
   idnode_list_mapping_t *ilm;
+  const char *s;
 
   switch (ae->ae_conn_limit_type) {
   case ACCESS_CONN_LIMIT_TYPE_ALL:
@@ -567,8 +569,12 @@ access_update(access_t *a, access_entry_t *ae)
   if (!a->aa_lang && ae->ae_lang && ae->ae_lang[0])
     a->aa_lang = lang_code_user(ae->ae_lang);
 
-  if (!a->aa_lang_ui && ae->ae_lang_ui && ae->ae_lang_ui[0])
-    a->aa_lang_ui = lang_code_user(ae->ae_lang_ui);
+  if (!a->aa_lang_ui) {
+    if (ae->ae_lang_ui && ae->ae_lang_ui[0])
+      a->aa_lang_ui = lang_code_user(ae->ae_lang_ui);
+    else if ((s = config_get_language_ui()) != NULL)
+      a->aa_lang_ui = lang_code_user(s);
+  }
 
   a->aa_rights |= ae->ae_rights;
 }

src/config.c

@@ -1913,10 +1913,10 @@ const idclass_t config_class = {
     },
     {
       .type   = PT_STR,
-      .id     = "ulanguage",
+      .id     = "language_ui",
       .name   = N_("User language"),
       .list   = language_get_list,
-      .off    = offsetof(config_t, ulanguage),
+      .off    = offsetof(config_t, language_ui),
       .group  = 3
     },
     {
@@ -1996,9 +1996,9 @@ const char *config_get_language ( void )
   return s;
 }
 
-const char *config_get_ulanguage ( void )
+const char *config_get_language_ui ( void )
 {
-  const char *s = config.ulanguage;
+  const char *s = config.language_ui;
   if (s == NULL || *s == '\0')
     return NULL;
   return s;

src/config.h

@@ -34,7 +34,7 @@ typedef struct config {
   char *server_name;
   char *language;
   char *info_area;
-  char *ulanguage;
+  char *language_ui;
   char *muxconf_path;
   int prefer_picon;
   char *chicon_path;
@@ -58,6 +58,6 @@ void        config_save    ( void );
 
 const char *config_get_server_name ( void );
 const char *config_get_language    ( void );
-const char *config_get_ulanguage   ( void );
+const char *config_get_language_ui ( void );
 
 #endif /* __TVH_CONFIG__H__ */

src/lang_codes.c

@@ -698,33 +698,26 @@ const char *lang_code_preferred( void )
 
 char *lang_code_user( const char *ucode )
 {
-  const char *pucode = config_get_ulanguage(), *s;
-  const char *codes = config_get_language();
+  const char *codes = config_get_language(), *s;
   char *ret;
 
-  if (!pucode && !codes)
+  if (!codes)
     return ucode ? strdup(ucode) : NULL;
-  ret = malloc(strlen(pucode ?: "") + strlen(codes ?: "") +
-               strlen(ucode ?: "") + 3);
+  if (!ucode)
+    return codes ? strdup(codes) : NULL;
+  ret = malloc(strlen(codes) + strlen(ucode ?: "") + 1);
   strcpy(ret, ucode);
-  if (pucode && strcmp(ret, pucode)) {
-    strcat(ret, ",");
-    strcat(ret, pucode);
-  }
-  if (codes) {
-    while (codes && *codes) {
-      s = codes;
-      while (*s && *s != ',')
-        s++;
-      if (strncmp(codes, ucode ?: "", s - codes) &&
-          strncmp(codes, pucode ?: "", s - codes)) {
-        strcat(ret, ",");
-        strncat(ret, codes, s - codes);
-      }
-      if (*s && *s == ',')
-        s++;
-      codes = s;
+  while (codes && *codes) {
+    s = codes;
+    while (*s && *s != ',')
+      s++;
+    if (strncmp(codes, ucode ?: "", s - codes)) {
+      strcat(ret, ",");
+      strncat(ret, codes, s - codes);
     }
+    if (*s && *s == ',')
+      s++;
+    codes = s;
   }
   return ret;
 }

src/webui/extjs.c

@@ -187,7 +187,7 @@ static int
 page_about(http_connection_t *hc, const char *remain, void *opaque)
 {
   htsbuf_queue_t *hq = &hc->hc_reply;
-  const char *lang = hc->hc_access->aa_lang;
+  const char *lang = hc->hc_access->aa_lang_ui;
 
   htsbuf_qprintf(hq, "<center>\n\
 <div class=\"about-title\">HTS Tvheadend %s</div>\n\