diff options
| author | Marcel Klehr <mklehr@gmx.net> | 2012-12-20 12:07:37 +0100 |
|---|---|---|
| committer | Marcel Klehr <mklehr@gmx.net> | 2012-12-23 18:17:21 +0100 |
| commit | 04b65a0b4ecbb915a6049017347b27c03025ca3c (patch) | |
| tree | 52e5087e1d42f7b426b1630f19ef88ed416075e7 | |
| parent | 0c9178d392970012b6c9f87fc8b88fada7eeaab5 (diff) | |
| download | etherpad-lite-04b65a0b4ecbb915a6049017347b27c03025ca3c.zip | |
Add support for three-letter lang codes
| -rw-r--r-- | src/static/js/html10n.js | 2 | ||||
| -rw-r--r-- | src/static/js/l10n.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/static/js/html10n.js b/src/static/js/html10n.js index 9769272f..3c4e5450 100644 --- a/src/static/js/html10n.js +++ b/src/static/js/html10n.js @@ -122,7 +122,7 @@ window.html10n = (function(window, document, undefined) { return } - if (!data[lang]) lang = lang.substr(0,2) + if (!data[lang]) lang = lang.substr(0, lang.indexOf('-') == -1? lang.length : lang.indexOf('-')) if (!data[lang]) { cb(new Error('Couldn\'t find translations for '+lang)) return diff --git a/src/static/js/l10n.js b/src/static/js/l10n.js index 0bd060fe..7556b740 100644 --- a/src/static/js/l10n.js +++ b/src/static/js/l10n.js @@ -1,6 +1,6 @@ (function(document) { // Set language for l10n - var language = document.cookie.match(/language=(\w{2})/); + var language = document.cookie.match(/language=(\w{2,3})(-w+)?/); if(language) language = language[1]; html10n.bind('indexed', function() { |