CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 17:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2688 from 1ec5/wikipedia-2682

Browse Source 
Switch Wikipedia list to osmlab/wmf-sitematrix
This commit is contained in:
Bryan Housel
2015-09-27 23:14:27 -04:00
parent 12409e48e1 130f26b06d
commit b96afcf132
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -127,6 +127,10 @@ suggestions:
npm install name-suggestion-index@git://github.com/osmlab/name-suggestion-index.git
cp node_modules/name-suggestion-index/name-suggestions.json data/name-suggestions.json
wikipedias:
npm install wmf-sitematrix@git://github.com/osmlab/wmf-sitematrix.git
cp node_modules/wmf-sitematrix/wikipedia.min.json data/wikipedia.json
SPRITE = inkscape --export-area-page
dist/img/line-presets.png: svg/line-presets.svg

2
data/wikipedia.json
View File

File diff suppressed because one or more lines are too long

7
js/id/ui/preset/wikipedia.js
View File

@@ -70,11 +70,14 @@ iD.ui.preset.wikipedia = function(field, context) {
function language() {
var value = lang.value().toLowerCase();
var locale = iD.detect().locale.toLowerCase();
var localeLanguage;
return _.find(iD.data.wikipedia, function(d) {
if (d[2] === locale) localeLanguage = d;
return d[0].toLowerCase() === value ||
d[1].toLowerCase() === value ||
d[2].toLowerCase() === value;
}) || iD.data.wikipedia[0];
d[2] === value;
}) || localeLanguage || ['English', 'English', 'en'];
}
function changeLang() {