forked from 0x2620/pandora
default locale is default user locale (no need for separate config property); fix typo in default description
This commit is contained in:
parent
2af53d5da4
commit
6117438fbe
5 changed files with 6 additions and 10 deletions
|
@ -717,7 +717,6 @@
|
|||
"system": "0xDB@0xDB.org"
|
||||
},
|
||||
"https": true,
|
||||
"locale": "en",
|
||||
"id": "0xdb",
|
||||
"name": "0xDB",
|
||||
"url": "0xDB.org",
|
||||
|
@ -805,7 +804,7 @@
|
|||
"listSort": [{"key": "director", "operator": "+"}],
|
||||
"listView": "grid",
|
||||
"lists": {},
|
||||
"locale": "",
|
||||
"locale": "en",
|
||||
"mapFind": "",
|
||||
"mapSelection": "",
|
||||
"page": "",
|
||||
|
|
|
@ -730,7 +730,6 @@
|
|||
},
|
||||
"folderdepth": 4,
|
||||
"https": true,
|
||||
"locale": "en",
|
||||
"id": "indiancinema",
|
||||
"name": "Indiancine.ma",
|
||||
"url": "indiancine.ma",
|
||||
|
@ -817,7 +816,7 @@
|
|||
"listSort": [{"key": "year", "operator": "+"}],
|
||||
"listView": "grid",
|
||||
"lists": {},
|
||||
"locale": "",
|
||||
"locale": "en",
|
||||
"mapFind": "",
|
||||
"mapSelection": "",
|
||||
"page": "",
|
||||
|
|
|
@ -608,7 +608,6 @@
|
|||
"system": "system@pad.ma"
|
||||
},
|
||||
"https": true,
|
||||
"locale": "en",
|
||||
"id": "padma",
|
||||
"name": "Pad.ma",
|
||||
"url": "pad.ma",
|
||||
|
@ -695,7 +694,7 @@
|
|||
"listSort": [{"key": "title", "operator": "+"}],
|
||||
"listView": "grid",
|
||||
"lists": {},
|
||||
"locale": "",
|
||||
"locale": "en",
|
||||
"mapFind": "",
|
||||
"mapSelection": "",
|
||||
"page": "",
|
||||
|
|
|
@ -516,7 +516,7 @@
|
|||
],
|
||||
"sendReferrer": true,
|
||||
"site": {
|
||||
"description": "This is a demp of pan.do/ra a free, open source media archive. It allows you to manage large, decentralized collections of video, to collaboratively create metadata and time-based annotations, and to serve your archive as a cutting-edge web application.",
|
||||
"description": "This is a demo of pan.do/ra - a free, open source media archive. It allows you to manage large, decentralized collections of video, to collaboratively create metadata and time-based annotations, and to serve your archive as a cutting-edge web application.",
|
||||
"email": {
|
||||
// E-mail address in contact form (to)
|
||||
"contact": "system@pandora.local",
|
||||
|
@ -527,7 +527,6 @@
|
|||
},
|
||||
"https": false,
|
||||
"id": "pandora",
|
||||
"locale": "en",
|
||||
"name": "Demo",
|
||||
"url": "pandora.local",
|
||||
"videoprefix": ""
|
||||
|
@ -613,7 +612,7 @@
|
|||
"listSort": [{"key": "title", "operator": "+"}],
|
||||
"listView": "grid",
|
||||
"lists": {},
|
||||
"locale": "",
|
||||
"locale": "en",
|
||||
"mapFind": "",
|
||||
"mapSelection": "",
|
||||
"page": "",
|
||||
|
|
|
@ -1933,7 +1933,7 @@ pandora.setLocale = function(locale, callback) {
|
|||
// language from http header might not be supported,
|
||||
// fall back to site default
|
||||
if (Ox.isUndefined(Ox.LOCALE_NAMES[locale])) {
|
||||
locale = pandora.site.site.locale;
|
||||
locale = pandora.site.user.ui.locale;
|
||||
}
|
||||
if (locale != 'en') {
|
||||
if (pandora.localStorage('enableDebugMode')) {
|
||||
|
|
Loading…
Reference in a new issue