Merge remote-tracking branch 'upstream/pull/2471'

[rails.git] / script / locale / po2yaml

diff --git a/script/locale/po2yaml b/script/locale/po2yaml
index 3e05363e7e040eafbc0eb975c1bd3245c45b9342..69278ea6914f98241511df0830c4f1b077e95ea5 100755 (executable)
--- a/script/locale/po2yaml
+++ b/script/locale/po2yaml
@@ -11,9 +11,8 @@ def add_translation(hash, keys, value)
   if keys.empty?
     hash[key] = value
   else
-    unless hash.has_key? key
-      hash[key] = {}
-    end
+    hash[key] ||= {}
+
     add_translation(hash[key], keys, value)
   end
   hash
@@ -22,29 +21,29 @@ end
 def po2hash(f)
   trs = {}
   path = []
-  msgstr = ''
-  f.each_line { |line|
+  msgstr = ""
+  f.each_line do |line|
     line.strip!
     if line[0..8] == 'msgctxt "'
-      path = line[9..-2].split(':')
+      path = line[9..-2].split(":")
     elsif line[0..7] == 'msgstr "'
       msgstr = line[8..-2]
     end
-    
-    if !path.empty? and !msgstr.empty?
-      add_translation(trs, path, msgstr)
-      path = []
-      msgstr = ''
-    end
-  }
+
+    next if path.empty? || msgstr.empty?
+
+    add_translation(trs, path, msgstr)
+    path = []
+    msgstr = ""
+  end
   trs
 end
 
 filename = ARGV[0]
 pofile = File.open(filename, "r")
 
-langcode = File.basename(filename, '.po')
+langcode = File.basename(filename, ".po")
 
-tr = {langcode => po2hash(pofile)}
+tr = { langcode => po2hash(pofile) }
 
 print tr.to_yaml