summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhallgren <hallgren@chalmers.se>2016-05-13 13:03:28 +0000
committerhallgren <hallgren@chalmers.se>2016-05-13 13:03:28 +0000
commitbde9dc7cfdf4142909c9f9d06625aeb2352f504e (patch)
tree10f61bed93c4f7104ed2205e4e797c55bde22605
parent2b182c4e634b5270b929ef3968725eb9489f8fdc (diff)
Add a few missing languages in js/langcode.js. Use it also in gfse/editor.js.
gfse/editor.js had its own list with 34 languages, while js/langcode.js only had 30 languages. The missing languages have been added to js/langcode.js and all apps now use that list.
-rw-r--r--src/www/gfse/editor.js36
-rw-r--r--src/www/js/langcode.js5
2 files changed, 11 insertions, 30 deletions
diff --git a/src/www/gfse/editor.js b/src/www/gfse/editor.js
index 2eb247991..a579a5eea 100644
--- a/src/www/gfse/editor.js
+++ b/src/www/gfse/editor.js
@@ -570,40 +570,20 @@ function quiz_button(g,err_ind) {
button("Quiz",compile))
}
-
-var languages =
- function() {
- function lang(code,name) { return { code:code, name:name} }
- function lang1(name) {
- var ws=name.split("/");
- return ws.length==1 ? lang(name.substr(0,3),name) : lang(ws[0],ws[1]);
- }
-
- // Language names and 3-letter ISO-639 codes
- // See http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
- var languages=map(lang1,"Afrikaans Amharic Arabic Bulgarian Catalan Chinese Danish Dutch English Estonian Finnish French German Greek Hindi Ina/Interlingua Italian Jpn/Japanese Latin Lav/Latvian Mlt/Maltese Mongolian Norwegian Pes/Persian Polish Pnb/Punjabi Ron/Romanian Russian Snd/Sindhi Spanish Swedish Thai Turkish Urdu".split(" "));
- languages.push(lang("Other","Other"));
- return languages
- }()
-
-var langname={};
-for(var i in languages)
- langname[languages[i].code]=languages[i].name
-
-function concname(code) { return langname[code] || code; }
-
function add_concrete(g,file) {
clear(file);
var dc={};
for(var i in g.concretes)
dc[g.concretes[i].langcode]=true;
var list=[]
- for(var i in languages) {
- var l=languages[i], c=l.code;
- if(!dc[c])
- list.push(li([a(jsurl("add_concrete2("+g.index+",'"+c+"')"),
- [text(l.name)])]));
- }
+ function addconc(name,code) {
+ if(!dc[code])
+ list.push(li([a(jsurl("add_concrete2("+g.index+",'"+code+"')"),
+ [text(name)])]));
+ }
+ for(var i in languages)
+ addconc(languages[i].name,languages[i].code)
+ addconc("Other","Other")
var from= g.current>0
? "a copy of "+concname(g.concretes[g.current-1].langcode)
:"scratch";
diff --git a/src/www/js/langcode.js b/src/www/js/langcode.js
index 4bf563316..eaec25f73 100644
--- a/src/www/js/langcode.js
+++ b/src/www/js/langcode.js
@@ -20,9 +20,10 @@ var languages =
"Chinese:zh","Danish:da","Dutch:nl","English:en","Estonian:et",
"Finnish:fi","French:fr","German:de","Greek:el","Hindi:hi",
"Ina/Interlingua:ia","Italian:it","Jpn/Japanese:ja","Latin:la",
+ "Lav/Latvian:lv","Mlt/Maltese:mt","Mongolian:mn",
"Norwegian:nb","Pes/Persian:fa","Polish:pl","Pnb/Punjabi:pa",
- "Ron/Romanian:ro","Russian:ru","Spanish:es","Swedish:sv",
- "Thai:th","Turkish:tr","Urdu:ur"]
+ "Ron/Romanian:ro","Russian:ru","Snd/Sindhi:sd","Spanish:es",
+ "Swedish:sv","Thai:th","Turkish:tr","Urdu:ur"]
// GF uses nonstd 3-letter codes? Pes/Persian:fa, Pnb/Punjabi:pa
return map(lang1,ls)
}()