Locale maintenance:

* Rename be-TARASK to be-Tarask
* Rename sr-EC to sr
* Rename sr-EL to sr-Latn
* Update README file in locales/
* Update languages.yml

diff --git a/config/languages.yml b/config/languages.yml
index bc986a54b619118e30285381ef20943b67ca4986..d4baa3b3e89ca9a0bbb6dda6956ca98810d7bb0e 100644 (file)
--- a/config/languages.yml
+++ b/config/languages.yml
@@ -40,6 +40,9 @@ ba:
 be: 
   english: Belarusian
   native: Беларуская
+be-Tarask: 
+  english: Belarusian (Taraškievica orthography)
+  native: беларуская (тарашкевіца)
 bg: 
   english: Bulgarian
   native: Български
@@ -474,10 +477,10 @@ sq:
   native: Shqip
 sr: 
   english: Serbian
-  native: Српски / Srpski
-sr-EC: 
-  english: Serbian Cyrillic ekavian
-  native: Српски (ћирилица)
+  native: Српски
+sr-Latn: 
+  english: Serbian (Latin script)
+  native: srpski (latinica)
 ss: 
   english: Swati
   native: SiSwati

diff --git a/config/locales/README b/config/locales/README
index 1262e2d0c61660b0a28ade1f4ed02e1f29153c1e..e8dc83288dfa82c029b77d4f3e0e8dcb410f4ba5 100644 (file)
--- a/config/locales/README
+++ b/config/locales/README
@@ -1,13 +1,13 @@
 This directory contains all the translations for the openstreetmap.org website.
 
-Do NOT edit any translations in here, please use TranslateWiki instead.
+Do NOT edit any translations in here, please use translatewiki.net instead.
 
 The only file in this directory that should be edited by hand is en.yml, when
-localisation strings change or new translations are introduced. All other 
-languages _need_ to be edited using TranslateWiki. Please make sure that you 
-run the tests using *rake test* to make sure that there are no errors, as there 
+localisation strings change or new translations are introduced. All other
+languages _need_ to be edited using translatewiki.net. Please make sure that you
+run the tests using *rake test* to make sure that there are no errors, as there
 is at least one test that makes sure that all translations are valid (we'll
 makes sure that they won't cause the site to not work).
 
 There is more information about translating the website on the wiki at
-http://wiki.openstreetmap.org/wiki/Website_Internationalization
+http://wiki.openstreetmap.org/wiki/Website_Internationalization.

diff --git a/config/locales/be-TARASK.yml b/config/locales/be-Tarask.yml
similarity index 100%
rename from config/locales/be-TARASK.yml
rename to config/locales/be-Tarask.yml

diff --git a/config/locales/sr-EL.yml b/config/locales/sr-Latn.yml
similarity index 100%
rename from config/locales/sr-EL.yml
rename to config/locales/sr-Latn.yml

diff --git a/config/locales/sr-EC.yml b/config/locales/sr.yml
similarity index 100%
rename from config/locales/sr-EC.yml
rename to config/locales/sr.yml

diff --git a/config/potlatch/locales/be-TARASK.yml b/config/potlatch/locales/be-Tarask.yml
similarity index 100%
rename from config/potlatch/locales/be-TARASK.yml
rename to config/potlatch/locales/be-Tarask.yml

diff --git a/config/potlatch/locales/sr-EC.yml b/config/potlatch/locales/sr.yml
similarity index 100%
rename from config/potlatch/locales/sr-EC.yml
rename to config/potlatch/locales/sr.yml