From b88065e250eff9786de4908e77fcf0ad17cb0fdd Mon Sep 17 00:00:00 2001 From: hallgren Date: Fri, 26 Apr 2013 13:42:01 +0000 Subject: [PATCH] Add greek to Setup.hs and the web apps --- Setup.hs | 3 ++- src/www/gfse/editor.js | 5 ++++- src/www/translator/translator.js | 6 ++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Setup.hs b/Setup.hs index 28b97a408..8a3ce5402 100644 --- a/Setup.hs +++ b/Setup.hs @@ -221,6 +221,7 @@ langsCoding = [ (("english", "Eng"),""), (("finnish", "Fin"),""), (("french", "Fre"),""), + (("greek", "Gre"),""), (("hebrew", "Heb"),""), (("hindi", "Hin"),"to_devanagari"), (("german", "Ger"),""), @@ -254,7 +255,7 @@ langsLang = langs -- `except` ["Amh","Ara","Lat","Tur","Mlt"] --langsLang = langs `only` ["Fin"] --test -- languagues that have notpresent marked -langsPresent = langsLang `except` ["Chi","Heb","Jpn","Mlt","Nep","Pes","Snd","Tha","Thb"] +langsPresent = langsLang `except` ["Chi","Gre","Heb","Jpn","Mlt","Nep","Pes","Snd","Tha","Thb"] -- languages for which to compile Try langsAPI = langsLang `except` langsIncomplete -- ["Ina","Mlt","Amh","Ara"] diff --git a/src/www/gfse/editor.js b/src/www/gfse/editor.js index 11ba18b37..dc1363fd3 100644 --- a/src/www/gfse/editor.js +++ b/src/www/gfse/editor.js @@ -576,8 +576,11 @@ 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,"Amharic Arabic Bulgarian Catalan Chinese Danish Dutch English Finnish French German Hindi Ina/Interlingua Italian Jpn/Japanese Latin Norwegian Polish Ron/Romanian Russian Spanish Swedish Thai Turkish Urdu".split(" ")); + map(lang1,"Amharic Arabic Bulgarian Catalan Chinese Danish Dutch English Finnish French German Greek Hindi Ina/Interlingua Italian Jpn/Japanese Latin Norwegian Polish Ron/Romanian Russian Spanish Swedish Thai Turkish Urdu".split(" ")); languages.push(lang("Other","Other")); var langname={}; diff --git a/src/www/translator/translator.js b/src/www/translator/translator.js index 9f056ff52..e7b080c78 100644 --- a/src/www/translator/translator.js +++ b/src/www/translator/translator.js @@ -1028,8 +1028,8 @@ function show_translation(o) { /* --- Auxiliary functions -------------------------------------------------- */ -function lang(code,name,code2) { return {code:code, name:name, code2:code2} } function lang1(namecode2) { + function lang(code,name,code2) {return {code:code, name:name, code2:code2}} var nc=namecode2.split(":"); var name=nc[0] var ws=name.split("/"); @@ -1038,8 +1038,10 @@ function lang1(namecode2) { : lang(ws[0],ws[1],code2); } +// Language names and ISO-639 codes (both 3-letter and 2-letter codes) +// See http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes var languages = // [ISO-639-2 code "/"] language name ":" ISO 639-1 code - map(lang1,"Amharic:am Arabic:ar Bulgarian:bg Catalan:ca Chinese:zh Danish:da Dutch:nl English:en Finnish:fi French:fr German:de Hindi:hi Ina/Interlingua:ia Italian:it Jpn/Japanese:ja Latin:la Norwegian:nb Polish:pl Ron/Romanian:ro Russian:ru Spanish:es Swedish:sv Thai:th Turkish:tr Urdu:ur".split(" ")); + map(lang1,"Amharic:am Arabic:ar Bulgarian:bg Catalan:ca Chinese:zh Danish:da Dutch:nl English:en Finnish:fi French:fr German:de Greek:el Hindi:hi Ina/Interlingua:ia Italian:it Jpn/Japanese:ja Latin:la Norwegian:nb Polish:pl Ron/Romanian:ro Russian:ru Spanish:es Swedish:sv Thai:th Turkish:tr Urdu:ur".split(" ")); var langname={}; var langcode2={}