idnode: improve language detection for data/time conversions

tvheadend · May 6, 2016 · 4169e8e · 4169e8e
1 parent 3f343a9
commit 4169e8e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/webui/static/app/idnode.js b/src/webui/static/app/idnode.js
@@ -377,7 +377,7 @@ tvheadend.IdNodeField = function(conf)
             return function(v) {
                 if (v > 0) {
                     var dt = new Date(v * 1000);
-                    var wd = dt.toLocaleString(window.navigator.language, {weekday: 'short'});
+                    var wd = dt.toLocaleString(tvheadend.language, {weekday: 'short'});
                     return wd + ' ' + dt.toLocaleString();
                 }
                 return '';

diff --git a/src/webui/static/app/tvheadend.js b/src/webui/static/app/tvheadend.js
@@ -10,6 +10,7 @@ tvheadend.wizard = null;
 tvheadend.docs_toc = null;
 tvheadend.doc_history = [];
 tvheadend.doc_win = null;
+tvheadend.language = window.navigator.userLanguage || window.navigator.language;
 
 tvheadend.cookieProvider = new Ext.state.CookieProvider({
   // 7 days from now
@@ -412,7 +413,7 @@ Ext.Ajax.request({
  */
 tvheadend.niceDate = function(dt) {
     var d = new Date(dt);
-    return '<div class="x-nice-dayofweek">' + d.toLocaleString(window.navigator.language, {weekday: 'long'}) + '</div>' +
+    return '<div class="x-nice-dayofweek">' + d.toLocaleString(tvheadend.language, {weekday: 'long'}) + '</div>' +
            '<div class="x-nice-date">' + d.toLocaleDateString() + '</div>' +
            '<div class="x-nice-time">' + d.toLocaleTimeString() + '</div>';
 }