From 9694def11a94de68b1bed47e2dcee4fe14c65eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Fri, 4 Sep 2020 19:34:33 +0200 Subject: [PATCH] Enable Serbian (Cyrillic) Consul uses two variants of Serbian: Serbian (Cirylic), and Serbian (Latin) so wee need to use different locale codes for each of them to avoid collisions. The folder names of both languages were correct but the locale code within the files was the same for both languages "sr" so translations were mixed. This commit changes the locale code within Serbian (Latin) translations files to "sr-CS", also adds a new language mapping to the Crowdin config file so next ConsulBot commits with Serbian (Latin) translations will be done using the locale code defined at new language mapping. --- config/application.rb | 1 + config/locales/sr-CS/activemodel.yml | 2 +- config/locales/sr-CS/activerecord.yml | 2 +- config/locales/sr-CS/admin.yml | 2 +- config/locales/sr-CS/budgets.yml | 2 +- config/locales/sr-CS/community.yml | 2 +- config/locales/sr-CS/devise.yml | 2 +- config/locales/sr-CS/devise_views.yml | 2 +- config/locales/sr-CS/documents.yml | 2 +- config/locales/sr-CS/general.yml | 2 +- config/locales/sr-CS/i18n.yml | 2 +- config/locales/sr-CS/images.yml | 2 +- config/locales/sr-CS/kaminari.yml | 2 +- config/locales/sr-CS/legislation.yml | 2 +- config/locales/sr-CS/mailers.yml | 2 +- config/locales/sr-CS/management.yml | 2 +- config/locales/sr-CS/milestones.yml | 2 +- config/locales/sr-CS/moderation.yml | 2 +- config/locales/sr-CS/officing.yml | 2 +- config/locales/sr-CS/pages.yml | 2 +- config/locales/sr-CS/rails.yml | 2 +- config/locales/sr-CS/responders.yml | 2 +- config/locales/sr-CS/seeds.yml | 2 +- config/locales/sr-CS/settings.yml | 2 +- config/locales/sr-CS/social_share_button.yml | 2 +- config/locales/sr-CS/stats.yml | 2 +- config/locales/sr-CS/valuation.yml | 2 +- config/locales/sr-CS/verification.yml | 2 +- crowdin.yml | 1 + 29 files changed, 29 insertions(+), 27 deletions(-) diff --git a/config/application.rb b/config/application.rb index dcd864864..b137dd5f6 100644 --- a/config/application.rb +++ b/config/application.rb @@ -49,6 +49,7 @@ module Consul "sl", "sq", "so", + "sr", "sv", "tr", "val", diff --git a/config/locales/sr-CS/activemodel.yml b/config/locales/sr-CS/activemodel.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/activemodel.yml +++ b/config/locales/sr-CS/activemodel.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/activerecord.yml b/config/locales/sr-CS/activerecord.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/activerecord.yml +++ b/config/locales/sr-CS/activerecord.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/admin.yml b/config/locales/sr-CS/admin.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/admin.yml +++ b/config/locales/sr-CS/admin.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/budgets.yml b/config/locales/sr-CS/budgets.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/budgets.yml +++ b/config/locales/sr-CS/budgets.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/community.yml b/config/locales/sr-CS/community.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/community.yml +++ b/config/locales/sr-CS/community.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/devise.yml b/config/locales/sr-CS/devise.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/devise.yml +++ b/config/locales/sr-CS/devise.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/devise_views.yml b/config/locales/sr-CS/devise_views.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/devise_views.yml +++ b/config/locales/sr-CS/devise_views.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/documents.yml b/config/locales/sr-CS/documents.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/documents.yml +++ b/config/locales/sr-CS/documents.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/general.yml b/config/locales/sr-CS/general.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/general.yml +++ b/config/locales/sr-CS/general.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/i18n.yml b/config/locales/sr-CS/i18n.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/i18n.yml +++ b/config/locales/sr-CS/i18n.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/images.yml b/config/locales/sr-CS/images.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/images.yml +++ b/config/locales/sr-CS/images.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/kaminari.yml b/config/locales/sr-CS/kaminari.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/kaminari.yml +++ b/config/locales/sr-CS/kaminari.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/legislation.yml b/config/locales/sr-CS/legislation.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/legislation.yml +++ b/config/locales/sr-CS/legislation.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/mailers.yml b/config/locales/sr-CS/mailers.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/mailers.yml +++ b/config/locales/sr-CS/mailers.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/management.yml b/config/locales/sr-CS/management.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/management.yml +++ b/config/locales/sr-CS/management.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/milestones.yml b/config/locales/sr-CS/milestones.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/milestones.yml +++ b/config/locales/sr-CS/milestones.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/moderation.yml b/config/locales/sr-CS/moderation.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/moderation.yml +++ b/config/locales/sr-CS/moderation.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/officing.yml b/config/locales/sr-CS/officing.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/officing.yml +++ b/config/locales/sr-CS/officing.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/pages.yml b/config/locales/sr-CS/pages.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/pages.yml +++ b/config/locales/sr-CS/pages.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/rails.yml b/config/locales/sr-CS/rails.yml index 4061b3a5c..6fe850c90 100644 --- a/config/locales/sr-CS/rails.yml +++ b/config/locales/sr-CS/rails.yml @@ -1,4 +1,4 @@ -sr: +sr-CS: date: abbr_day_names: - Ned diff --git a/config/locales/sr-CS/responders.yml b/config/locales/sr-CS/responders.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/responders.yml +++ b/config/locales/sr-CS/responders.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/seeds.yml b/config/locales/sr-CS/seeds.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/seeds.yml +++ b/config/locales/sr-CS/seeds.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/settings.yml b/config/locales/sr-CS/settings.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/settings.yml +++ b/config/locales/sr-CS/settings.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/social_share_button.yml b/config/locales/sr-CS/social_share_button.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/social_share_button.yml +++ b/config/locales/sr-CS/social_share_button.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/stats.yml b/config/locales/sr-CS/stats.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/stats.yml +++ b/config/locales/sr-CS/stats.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/valuation.yml b/config/locales/sr-CS/valuation.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/valuation.yml +++ b/config/locales/sr-CS/valuation.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/config/locales/sr-CS/verification.yml b/config/locales/sr-CS/verification.yml index 9e26af819..01686f9b7 100644 --- a/config/locales/sr-CS/verification.yml +++ b/config/locales/sr-CS/verification.yml @@ -1 +1 @@ -sr: +sr-CS: diff --git a/crowdin.yml b/crowdin.yml index 29d5cf169..679a8d627 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -17,4 +17,5 @@ files: nl: nl pt-PT: pt ru: ru + sr-CS: sr-CS val-ES: val