Merge pull request #800 from pgiraud/2.12

Adding singhala and tamil language
hotosm · May 19, 2016 · f2bbca4 · f2bbca4
2 parents 75ceb43 + a1fb9ee
commit f2bbca4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/development.ini b/development.ini
@@ -14,9 +14,9 @@ pyramid.default_locale_name = en
 pyramid.includes =
     pyramid_debugtoolbar
 
-available_languages = en fr es de pt ja lt zh_TW id da pt_BR ru sl it nl_NL uk
+available_languages = en fr es de pt ja lt zh_TW id da pt_BR ru sl it nl_NL uk ta si
 # Full language names in native language (comma separated)
-available_languages_full = English, Français, Español, Deutsch, Português, 日本語, Lietuvos, 中文, Indonesia, Dansk, Português (Brasil), Русский, Slovenščina, Italiano, Nederlands, Українська
+available_languages_full = English, Français, Español, Deutsch, Português, 日本語, Lietuvos, 中文, Indonesia, Dansk, Português (Brasil), Русский, Slovenščina, Italiano, Nederlands, Українська, தமிழ், සිංහල
 
 sqlalchemy.url = postgresql://username:password@localhost/osmtm
 local_settings_path = %(here)s/local.ini

diff --git a/osmtm/templates/base.mako b/osmtm/templates/base.mako
@@ -17,9 +17,10 @@
       try:
         timeago_locale = request.static_url(timeago_locale_baseurl % request.locale_name.replace('_', '-'))
       except IOError:
-        timeago_locale = request.static_url(timeago_locale_baseurl % request.locale_name[:2])
-      except IOError:
-        timeago_locale = request.static_url(timeago_locale_baseurl % 'en')
+        try:
+          timeago_locale = request.static_url(timeago_locale_baseurl % request.locale_name[:2])
+        except IOError:
+          timeago_locale = request.static_url(timeago_locale_baseurl % 'en')
     %>
     <script src="${timeago_locale}"></script>
     <script src="${request.static_url('osmtm:static/js/lib/sammy-latest.min.js')}"></script>

diff --git a/production.ini b/production.ini
@@ -7,8 +7,9 @@ debug_routematch = false
 debug_templates = false
 default_locale_name = en
 
-available_languages = en fr es de pt ja lt zh_TW id da pt_BR ru sl it nl_NL uk
-available_languages_full = English, Français, Español, Deutsch, Português, 日本語, Lietuvos, 中文, Indonesia, Dansk, Português (Brasil), Русский, Slovenščina, Italiano, Nederlands, Українська
+available_languages = en fr es de pt ja lt zh_TW id da pt_BR ru sl it nl_NL uk ta si
+# Full language names in native language (comma separated)
+available_languages_full = English, Français, Español, Deutsch, Português, 日本語, Lietuvos, 中文, Indonesia, Dansk, Português (Brasil), Русский, Slovenščina, Italiano, Nederlands, Українська, தமிழ், සිංහල
 
 sqlalchemy.url = postgresql://username:password@localhost/osmtm
 local_settings_path = %(here)s/local.ini

diff --git a/setup.py b/setup.py
@@ -41,7 +41,7 @@
 ]
 
 setup(name='osmtm',
-      version='2.12.0',
+      version='2.12.1',
       description='osmtm',
       long_description=README + '\n\n' + CHANGES,
       classifiers=[