Move locales to separate directory

theoldreader · Feb 22, 2014 · b0dc1de · b0dc1de
1 parent 98bd454
commit b0dc1de
Show file tree

Hide file tree

Showing 24 changed files with 15 additions and 13 deletions.
diff --git a/Rakefile b/Rakefile
@@ -1,9 +1,10 @@
 namespace :i18n do
   desc "Invalidate locales one-by-one"
   task :invalidate do
-    available = Dir.glob("*.yml").map { |x| x.chomp(".yml").to_sym }
-    base = :en
-    translations = available - [base]
+    master = :en
+    basedir = File.join(Dir.pwd, "locales")
+    available = Dir.glob(File.join(basedir, "*.yml"))
+    translations = available - [master]
     identation = "  " # ._.
 
     while true
@@ -13,11 +14,12 @@ namespace :i18n do
 
       confirm = []
       results = Hash.new
-      translations.each do |locale|
-        lines = File.read("#{locale}.yml").split("\n")
+      translations.each do |translation|
+        locale = File.basename(translation, ".yml")
+        lines = File.read(translation).split("\n")
         result = Hash.new
         level = 0
-        full_path = [locale.to_s] + path.split(".")
+        full_path = [locale] + path.split(".")
 
         lines.each_with_index do |text, line|
           current_identation = "  "*level
@@ -55,17 +57,17 @@ namespace :i18n do
 
           confirm << "#{locale}.yml:#{multiline ? "#{result[:lines].first+1}..#{result[:lines].last+1}" : result[:lines].first+1}"
           confirm << (multiline ? "\n#{result[:texts].join("\n")}\n\n" : " - #{result[:texts].first.strip}\n")
-          results[locale] = result
+          results[translation] = result
         end
       end
 
       if confirm.any?
         puts confirm.join(""), "\n", "Confirm? y/n"
         if STDIN.gets.strip == "y"
-          results.each do |locale, result|
-            lines = File.read("#{locale}.yml").split("\n")
+          results.each do |translation, result|
+            lines = File.read(translation).split("\n")
             result[:lines].each { |x| lines[x] = nil }
-            File.open("#{locale}.yml", "w") { |f| f.write(lines.compact.join("\n")+"\n") }
+            File.open(translation, "w") { |f| f.write(lines.compact.join("\n")+"\n") }
           end
 
           puts "Done."

diff --git a/checker.py b/checker.py
@@ -16,6 +16,7 @@
 """
 
 master = "en"
+basedir = "%s/locales" % os.getcwd()
 
 def compare_dicts(master, victim, path):
     if type(victim) != dict:
@@ -70,7 +71,6 @@ def process_file(filename, master_data):
 
 def main(args):
     exitcode = 0
-    basedir = os.path.dirname(__file__) or '.'
     with open(os.path.join(basedir, "%s.yml" % master), 'r') as master_file:
         master_data = yaml.load(master_file)[master]
 

diff --git a/ca.yml → locales/ca.yml b/ca.yml → locales/ca.yml
diff --git a/cs.yml → locales/cs.yml b/cs.yml → locales/cs.yml
diff --git a/de.yml → locales/de.yml b/de.yml → locales/de.yml
diff --git a/el.yml → locales/el.yml b/el.yml → locales/el.yml
diff --git a/en.yml → locales/en.yml b/en.yml → locales/en.yml
diff --git a/es.yml → locales/es.yml b/es.yml → locales/es.yml
diff --git a/fa.yml → locales/fa.yml b/fa.yml → locales/fa.yml
diff --git a/fr.yml → locales/fr.yml b/fr.yml → locales/fr.yml
diff --git a/hu.yml → locales/hu.yml b/hu.yml → locales/hu.yml
diff --git a/it.yml → locales/it.yml b/it.yml → locales/it.yml
diff --git a/nb.yml → locales/nb.yml b/nb.yml → locales/nb.yml
diff --git a/nl.yml → locales/nl.yml b/nl.yml → locales/nl.yml
diff --git a/pl.yml → locales/pl.yml b/pl.yml → locales/pl.yml
diff --git a/pt.yml → locales/pt.yml b/pt.yml → locales/pt.yml
diff --git a/ru-old.yml → locales/ru-old.yml b/ru-old.yml → locales/ru-old.yml
diff --git a/ru.yml → locales/ru.yml b/ru.yml → locales/ru.yml
diff --git a/sk.yml → locales/sk.yml b/sk.yml → locales/sk.yml
diff --git a/sv.yml → locales/sv.yml b/sv.yml → locales/sv.yml
diff --git a/tr.yml → locales/tr.yml b/tr.yml → locales/tr.yml
diff --git a/uk.yml → locales/uk.yml b/uk.yml → locales/uk.yml
diff --git a/zh-cn.yml → locales/zh-cn.yml b/zh-cn.yml → locales/zh-cn.yml
@@ -56,8 +56,8 @@ zh-cn:
       unlock_instructions:
         subject: "帐户解锁"
 
-  # Reader
-  app: "The Old Reader"
+  # Reader
+  app: "The Old Reader"
   eggs: "We ♥ kittens"
   title: "The Old Reader"
   meta:

diff --git a/zh-tw.yml → locales/zh-tw.yml b/zh-tw.yml → locales/zh-tw.yml