Sort translations before export

app/models/tolk/locale.rb

@@ -50,10 +50,8 @@ def secondary_locales
         all - [primary_locale]
       end
 
-      def dump_all(to = self.locales_config_path, exporter = Tolk::Export)
-        secondary_locales.each do |locale|
-          exporter.dump(name: locale.name, data: locale.to_hash, destination: to)
-        end
+      def dump_all(*args)
+        secondary_locales.each { |locale| locale.dump(*args) }
       end
 
       def special_key_or_prefix?(prefix, key)
@@ -68,6 +66,10 @@ def pluralization_data?(data)
       end
     end
 
+    def dump(to = self.locales_config_path, exporter = Tolk::Export)
+      exporter.dump(name: name, data: to_hash, destination: to)
+    end
+
     def has_updated_translations?
       translations.count(:conditions => {:'tolk_translations.primary_updated' => true}) > 0
     end
@@ -132,13 +134,15 @@ def search_phrases_without_translation(query, page = nil, options = {})
     end
 
     def to_hash
-      { name => translations.each_with_object({}) do |translation, locale|
-        if translation.phrase.key.include?(".")
-          locale.deep_merge!(unsquish(translation.phrase.key, translation.value))
-        else
-          locale[translation.phrase.key] = translation.value
+      data = translations.includes(:phrase).order(phrases.arel_table[:key]).
+        each_with_object({}) do |translation, locale|
+          if translation.phrase.key.include?(".")
+            locale.deep_merge!(unsquish(translation.phrase.key, translation.value))
+          else
+            locale[translation.phrase.key] = translation.value
+          end
         end
-      end }
+      { name => data }
     end
 
     def to_param

lib/tolk/export.rb

@@ -10,7 +10,12 @@ def initialize(args)
 
     def dump
       File.open("#{destination}/#{name}.yml", "w+") do |file|
-        data.respond_to?(:ya2yaml) ? file.write(data.ya2yaml(:syck_compatible => true)) : file.write(YAML.dump(data).force_encoding file.external_encoding.name)
+        yml = if data.respond_to?(:ya2yaml)
+          data.ya2yaml(:syck_compatible => true)
+        else
+          YAML.dump(data).force_encoding(file.external_encoding.name)
+        end
+        file.write(yml)
       end
     end
 
@@ -23,6 +28,5 @@ def dump_path
         Tolk::Locale._dump_path
       end
     end
-
   end
-end
+end

test/locales/basic/da.yml

@@ -1,9 +1,9 @@
 ---
 da:
+  cozy: Hyggeligt
   hello_world: Hej Verden
   nested:
     hello_world: Nedarvet Hej Verden
-  cozy: Hyggeligt
   number:
     currency:
       format:

test/unit/locale_test.rb

@@ -14,7 +14,18 @@ class LocaleTest < ActiveSupport::TestCase
         "hello_world" => "Nested Hello World",
         "hello_country" => "Nested Hello Country"
       },
-      "number"=>{"human"=>{"format"=>{"precision"=>1}},"currency"=>{"format"=>{"significant"=>false}}}
+      "number" => {
+        "human" => {
+          "format" => {
+            "precision" => 1
+          }
+        },
+        "currency" => {
+          "format" => {
+            "significant" => false
+          }
+        }
+      }
     }}, tolk_locales(:en).to_hash)
   end