0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

default locale is default user locale (no need for separate config property); fix typo in default description

Browse source
This commit is contained in:
rolux 2013-08-04 14:37:35 +00:00
parent 2af53d5da4
commit 6117438fbe
5 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pandora/config.0xdb.jsonc
View file

@ -717,7 +717,6 @@
"system": "0xDB@0xDB.org" "system": "0xDB@0xDB.org"
}, },
"https": true, "https": true,
"locale": "en",
"id": "0xdb", "id": "0xdb",
"name": "0xDB", "name": "0xDB",
"url": "0xDB.org", "url": "0xDB.org",
@ -805,7 +804,7 @@
"listSort": [{"key": "director", "operator": "+"}], "listSort": [{"key": "director", "operator": "+"}],
"listView": "grid", "listView": "grid",
"lists": {}, "lists": {},
"locale": "", "locale": "en",
"mapFind": "", "mapFind": "",
"mapSelection": "", "mapSelection": "",
"page": "", "page": "",

3
pandora/config.indiancinema.jsonc
View file

@ -730,7 +730,6 @@
}, },
"folderdepth": 4, "folderdepth": 4,
"https": true, "https": true,
"locale": "en",
"id": "indiancinema", "id": "indiancinema",
"name": "Indiancine.ma", "name": "Indiancine.ma",
"url": "indiancine.ma", "url": "indiancine.ma",
@ -817,7 +816,7 @@
"listSort": [{"key": "year", "operator": "+"}], "listSort": [{"key": "year", "operator": "+"}],
"listView": "grid", "listView": "grid",
"lists": {}, "lists": {},
"locale": "", "locale": "en",
"mapFind": "", "mapFind": "",
"mapSelection": "", "mapSelection": "",
"page": "", "page": "",

3
pandora/config.padma.jsonc
View file

@ -608,7 +608,6 @@
"system": "system@pad.ma" "system": "system@pad.ma"
}, },
"https": true, "https": true,
"locale": "en",
"id": "padma", "id": "padma",
"name": "Pad.ma", "name": "Pad.ma",
"url": "pad.ma", "url": "pad.ma",
@ -695,7 +694,7 @@
"listSort": [{"key": "title", "operator": "+"}], "listSort": [{"key": "title", "operator": "+"}],
"listView": "grid", "listView": "grid",
"lists": {}, "lists": {},
"locale": "", "locale": "en",
"mapFind": "", "mapFind": "",
"mapSelection": "", "mapSelection": "",
"page": "", "page": "",

5
pandora/config.pandora.jsonc
View file

@ -516,7 +516,7 @@
], ],
"sendReferrer": true, "sendReferrer": true,
"site": { "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": { "email": {
// E-mail address in contact form (to) // E-mail address in contact form (to)
"contact": "system@pandora.local", "contact": "system@pandora.local",
@ -527,7 +527,6 @@
}, },
"https": false, "https": false,
"id": "pandora", "id": "pandora",
"locale": "en",
"name": "Demo", "name": "Demo",
"url": "pandora.local", "url": "pandora.local",
"videoprefix": "" "videoprefix": ""
@ -613,7 +612,7 @@
"listSort": [{"key": "title", "operator": "+"}], "listSort": [{"key": "title", "operator": "+"}],
"listView": "grid", "listView": "grid",
"lists": {}, "lists": {},
"locale": "", "locale": "en",
"mapFind": "", "mapFind": "",
"mapSelection": "", "mapSelection": "",
"page": "", "page": "",

2
static/js/utils.js
View file

@ -1933,7 +1933,7 @@ pandora.setLocale = function(locale, callback) {
// language from http header might not be supported, // language from http header might not be supported,
// fall back to site default // fall back to site default
if (Ox.isUndefined(Ox.LOCALE_NAMES[locale])) { if (Ox.isUndefined(Ox.LOCALE_NAMES[locale])) {
locale = pandora.site.site.locale; locale = pandora.site.user.ui.locale;
} }
if (locale != 'en') { if (locale != 'en') {
if (pandora.localStorage('enableDebugMode')) { if (pandora.localStorage('enableDebugMode')) {