Merge pull request svenfuchs#1017 from digitalfrost/170822

Remove orphan pluralizations
digitalfrost · Aug 23, 2022 · 418dd73 · 418dd73
2 parents 5044f85 + d619ef3
commit 418dd73
Show file tree

Hide file tree

Showing 54 changed files with 62 additions and 824 deletions.
diff --git a/README.md b/README.md
@@ -77,6 +77,12 @@ The cy locale was removed in commit 84f6c6b9b7a3e50df2b1fb1ccf7add329f7eab4f sin
 We would welcome contributions to add it back to the project.
 The locale is mostly complete for the missing translations please refer to [#1006](https://github.com/svenfuchs/rails-i18n/issues/1006)
 
+**Removed pluralizations:**
+
+ak, am, bh, bm, bo, br, by, cy, dz, ff, ga, gd, guw, gv, ig, ii, iu, jv, kab, kde, kea, ksh, kw, lag, ln, mo, mt, my, naq, nso, root, sah, se, ses, sg, sh, shi, sma, smi, smj, smn, sms, ti, to, tzm, wa, yo, zh
+
+The above pluralization rules were removed because they did not have corresponding locale files.
+
 
 Currently, most locales are incomplete. Typically they lack the following keys:
 

diff --git a/locales.thor b/locales.thor
@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + '/rails/test/lib/key_structure.rb'
 require File.dirname(__FILE__) + '/rails/test/lib/normalize.rb'
+require File.dirname(__FILE__) + '/rails/test/lib/check_locales.rb'
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/lib') unless $LOAD_PATH.include?(File.dirname(__FILE__) + '/lib')
 
 class Locales < Thor
@@ -75,12 +76,12 @@ class Locales < Thor
 
   desc 'list', 'List locale names.'
   def list
-    puts self.list_locales.join(', ')
+    puts CheckLocales.list_locales.join(', ')
   end
 
   desc 'count_all', 'Returns the number of available locales'
   def count_all
-    puts self.list_locales.count
+    puts CheckLocales.count
   end
 
   desc 'complete', 'List complete locales'
@@ -103,34 +104,13 @@ class Locales < Thor
     puts self.incomplete_locales.count
   end
 
-  desc 'orphaned_pluralizations', 'Returns pluralizations that do nothave a locale file'
-  def orphaned_pluralizations
-    orphans = self.list_pluralizations.difference(self.list_locales)
-    puts orphans.join(', ')
+  desc 'orphan_pluralizations', 'Returns pluralizations that do not have a locale file'
+  def orphan_pluralizations
+    puts CheckLocales.orphan_pluralizations.join(', ')
   end
 
   private
 
-  desc 'list_locales', 'List all locales'
-  def list_locales
-    path_to_locales = 'rails/locale'
-    Dir.chdir(path_to_locales)
-    locale_files = Dir.glob('**/*.yml')
-    locales = locale_files.map{ |f| File.basename(f, '.yml') }
-    Dir.chdir('../..') # rewind
-    return locales.sort
-  end
-
-  desc 'list_pluralizations', 'List all pluralizations'
-  def list_pluralizations
-    path_to_pluralizations = 'rails/pluralization'
-    Dir.chdir(path_to_pluralizations)
-    pluralization_files = Dir.glob('*.rb')
-    pluralizations = pluralization_files.map{ |f| File.basename(f, '.rb') }
-    Dir.chdir('../..') # rewind
-    return pluralizations.sort
-  end
-
   desc 'complete_locales', 'List complete locales'
   def complete_locales
     locales = []

diff --git a/rails/pluralization/ak.rb b/rails/pluralization/ak.rb
diff --git a/rails/pluralization/am.rb b/rails/pluralization/am.rb
diff --git a/rails/pluralization/bh.rb b/rails/pluralization/bh.rb
diff --git a/rails/pluralization/bm.rb b/rails/pluralization/bm.rb
diff --git a/rails/pluralization/bo.rb b/rails/pluralization/bo.rb
diff --git a/rails/pluralization/br.rb b/rails/pluralization/br.rb
diff --git a/rails/pluralization/by.rb b/rails/pluralization/by.rb
diff --git a/rails/pluralization/cy.rb b/rails/pluralization/cy.rb
diff --git a/rails/pluralization/dz.rb b/rails/pluralization/dz.rb
diff --git a/rails/pluralization/ff.rb b/rails/pluralization/ff.rb
diff --git a/rails/pluralization/ga.rb b/rails/pluralization/ga.rb
diff --git a/rails/pluralization/gd.rb b/rails/pluralization/gd.rb
diff --git a/rails/pluralization/guw.rb b/rails/pluralization/guw.rb
diff --git a/rails/pluralization/gv.rb b/rails/pluralization/gv.rb
diff --git a/rails/pluralization/ig.rb b/rails/pluralization/ig.rb
diff --git a/rails/pluralization/ii.rb b/rails/pluralization/ii.rb
diff --git a/rails/pluralization/iu.rb b/rails/pluralization/iu.rb
diff --git a/rails/pluralization/jv.rb b/rails/pluralization/jv.rb
diff --git a/rails/pluralization/kab.rb b/rails/pluralization/kab.rb
diff --git a/rails/pluralization/kde.rb b/rails/pluralization/kde.rb
diff --git a/rails/pluralization/kea.rb b/rails/pluralization/kea.rb
diff --git a/rails/pluralization/ksh.rb b/rails/pluralization/ksh.rb
diff --git a/rails/pluralization/kw.rb b/rails/pluralization/kw.rb
diff --git a/rails/pluralization/lag.rb b/rails/pluralization/lag.rb
diff --git a/rails/pluralization/ln.rb b/rails/pluralization/ln.rb
diff --git a/rails/pluralization/mo.rb b/rails/pluralization/mo.rb
diff --git a/rails/pluralization/mt.rb b/rails/pluralization/mt.rb
diff --git a/rails/pluralization/my.rb b/rails/pluralization/my.rb
diff --git a/rails/pluralization/naq.rb b/rails/pluralization/naq.rb