Merge branch 'fix-locales' of asonix/mastodon into asonix/changes

2018-08-24 04:23:46 +00:00 · 2018-08-24 04:23:46 +00:00 · b9c86b6ccb
commit b9c86b6ccb
parent 3a98854fc4 6d5d064461
2 changed files with 2 additions and 1 deletions
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@ -2,6 +2,7 @@

 module SettingsHelper
  HUMAN_LOCALES = {
+    squeak: 'Squeak',
    dog: 'Dog',
    lion: 'Lion',
    en: 'English',
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@ -1,7 +1,7 @@
 # i18n-tasks finds and manages missing and unused translations: https://github.com/glebm/i18n-tasks

 # The "main" locale.
-base_locale: dog
+base_locale: en
 data:
  read:
    - config/locales/%{locale}.yml