Distributed Peer-to-Peer Web Search Engine and Intranet Search Appliance
Java decentralizedintranet-searchintranet-search-enginep2pp2p-networkprivacyprivacy-protectionsearch-enginesearchenginewebweb-search-enginewebsearchwebseearch-engine
Renamed Chinese & Greek lng files using ISO639-1 codes.
lucciomancb10daba9225
diff --git a/htroot/ConfigBasic.html b/htroot/ConfigBasic.htmlindex b974dc33f..e8bd56d11 100644--- a/htroot/ConfigBasic.html+++ b/htroot/ConfigBasic.html@@ -37,17 +37,19 @@<input type="radio" name="language" value="default" id="lang_en" onchange="this.form.submit()" #(lang_en)#::checked="checked"#(/lang_en)# /><label for="lang_en" #(active_en)#::title="Click to generate translated pages"::class="label-success" title="Active : translated pages are available"#(/active_en)#>English</label> <input type="radio" name="language" value="de" id="lang_de" onchange="this.form.submit()" #(lang_de)#::checked="checked"#(/lang_de)# /><label for="lang_de" #(active_de)#::title="Click to generate translated pages"::class="label-success" title="Active : translated pages are available"#(/active_de)#>Deutsch</label> <input type="radio" name="language" value="fr" id="lang_fr" onchange="this.form.submit()" #(lang_fr)#::checked="checked"#(/lang_fr)# /><label for="lang_fr" #(active_fr)#::title="Click to generate translated pages"::class="label-success" title="Active : translated pages are available"#(/active_fr)#>Français</label> - <input type="radio" name="language" value="cn" id="lang_cn" onchange="this.form.submit()" #(lang_cn)#::checked="checked"#(/lang_cn)# /><label for="lang_cn" #(active_cn)#::title="Click to generate translated pages"::class="label-success" title="Active : translated pages are available"#(/active_cn)#>汉语/漢語</label>+ <input type="radio" name="language" value="zh" id="lang_zh" onchange="this.form.submit()" #(lang_zh)#::checked="checked"#(/lang_zh)# /><label for="lang_zh" #(active_zh)#::title="Click to generate translated pages"::class="label-success" title="Active : translated pages are available"#(/active_zh)#>汉语/漢語</label><input type="radio" name="language" value="ru" id="lang_ru" onchange="this.form.submit()" #(lang_ru)#::checked="checked"#(/lang_ru)# /><label for="lang_ru" #(active_ru)#::title="Click to generate translated pages"::class="label-success" title="Active : translated pages are available"#(/active_ru)#>Русский</label><input type="radio" name="language" value="uk" id="lang_uk" onchange="this.form.submit()" #(lang_uk)#::checked="checked"#(/lang_uk)# /><label for="lang_uk" #(active_uk)#::title="Click to generate translated pages"::class="label-success" title="Active : translated pages are available"#(/active_uk)#>Українська</label><input type="radio" name="language" value="hi" id="lang_hi" onchange="this.form.submit()" #(lang_hi)#::checked="checked"#(/lang_hi)# /><label for="lang_hi" #(active_hi)#::title="Click to generate translated pages"::class="label-success" title="Active : translated pages are available"#(/active_hi)#>हिन्दी</label>- <input type="radio" name="language" value="ja" id="lang_ja" onchange="this.form.submit()" #(lang_ja)#::checked="checked"#(/lang_ja)# /><label for="lang_ja" #(active_ja)#::title="Click to generate translated pages"::class="label-success" title="Active : translated pages are available"#(/active_ja)#>日本語</label>+ <input type="radio" name="language" value="ja" id="lang_ja" onchange="this.form.submit()" #(lang_ja)#::checked="checked"#(/lang_ja)# /><label for="lang_ja" #(active_ja)#::title="Click to generate translated pages"::class="label-success" title="Active : translated pages are available"#(/active_ja)#>日本語</label>+ <input type="radio" name="language" value="el" id="lang_el" onchange="this.form.submit()" #(lang_el)#::checked="checked"#(/lang_el)# /><label for="lang_el" #(active_el)#::title="Click to generate translated pages"::class="label-success" title="Active : translated pages are available"#(/active_el)#>Greek</label></fieldset></li><!-- take care that no other items are changed, but also change the former if no js is enabled --><script type="text/javascript"> document.write('</form><form action="ConfigBasic.html" method="get">'); </script>#(setUseCase)#::+<li><img src="env/grafics/ok.png" height="16" width="16" alt="ok" /> Use Case: what do you want to do with YaCy:<br /><fieldset>diff --git a/htroot/ConfigBasic.java b/htroot/ConfigBasic.javaindex 3f292d795..414a47908 100644--- a/htroot/ConfigBasic.java+++ b/htroot/ConfigBasic.java@@ -271,11 +271,12 @@ public class ConfigBasic {prop.put("lang_browser", "0"); // for client browser language dependentprop.put("lang_de", "0");prop.put("lang_fr", "0");- prop.put("lang_cn", "0");+ prop.put("lang_zh", "0");prop.put("lang_ru", "0");prop.put("lang_uk", "0");prop.put("lang_en", "0");prop.put("lang_ja", "0");+ prop.put("lang_el", "0");if ("default".equals(lang)) {prop.put("lang_en", "1");} else {@@ -284,11 +285,12 @@ public class ConfigBasic {// set label class (green background) for active translationif (lang.equals("browser")) {List<String> l = Translator.activeTranslations();- prop.put("active_cn", l.contains("cn") ? "2" : "1");+ prop.put("active_zh", l.contains("zh") ? "2" : "1");prop.put("active_de", l.contains("de") ? "2" : "1");prop.put("active_fr", l.contains("fr") ? "2" : "1");prop.put("active_hi", l.contains("hi") ? "2" : "1");prop.put("active_ja", l.contains("ja") ? "2" : "1");+ prop.put("active_el", l.contains("el") ? "2" : "1");prop.put("active_ru", l.contains("ru") ? "2" : "1");prop.put("active_uk", l.contains("uk") ? "2" : "1");prop.put("active_en", "2");@@ -297,11 +299,12 @@ public class ConfigBasic {prop.put("active_de", "0");prop.put("active_fr", "0");prop.put("active_hi", "0");- prop.put("active_cn", "0");+ prop.put("active_zh", "0");prop.put("active_ru", "0");prop.put("active_uk", "0");prop.put("active_en", "0");prop.put("active_ja", "0");+ prop.put("active_el", "0");}return prop;}diff --git a/locales/gr.lng b/locales/el.lngsimilarity index 98%rename from locales/gr.lngrename to locales/el.lngindex bddbaefbc..bc699abe5 100644--- a/locales/gr.lng+++ b/locales/el.lng@@ -1,4 +1,4 @@-# gr.lng+# el.lng# English-->Greek# -----------------------# part of YaCydiff --git a/locales/cn.lng b/locales/zh.lngsimilarity index 99%rename from locales/cn.lngrename to locales/zh.lngindex 6999ff139..9f97c4e43 100644--- a/locales/cn.lng+++ b/locales/zh.lng@@ -1,4 +1,4 @@-# cn.lng+# zh.lng# English-->Chinese# -----------------------# This is a part of YaCy, a peer-to-peer based web search enginediff --git a/source/net/yacy/data/Translator.java b/source/net/yacy/data/Translator.javaindex d4f5838d2..03e55c61b 100644--- a/source/net/yacy/data/Translator.java+++ b/source/net/yacy/data/Translator.java@@ -272,7 +272,7 @@ public class Translator {final String[] ms = CommonPattern.COMMA.split("browser/Browser Language," +"default/English,de/Deutsch,fr/Français,nl/Nederlands,it/Italiano,es/Español,pt/Portugês,fi/Suomi,se/Svenska,dk/Dansk," +- "gr/Eλληvικα,sk/Slovensky,cn/汉语/漢語," ++ "el/Eλληvικα,sk/Slovensky,zh/汉语/漢語," +"ru/Русский,uk/Українська," +"hi/हिन्दी,ja/日本語");