translation 0.9.7 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76f06309119b4856d8334ab42dd1a79600415e9b
-  data.tar.gz: 97ca726e59f4a331f41f03b6644b0c4accb09298
+  metadata.gz: a79514a84e9a61c0b950fb4225a613e906cdeb80
+  data.tar.gz: bab34ec6a4ffb1b3f759640eccea15090a5261d2
 SHA512:
-  metadata.gz: 1bee96e7ec136d640da01c9ea420f8c07f9d38ce40d73289059da10890a060345255b8f9d088e400223b492b49cc8a83aee60cfab8e521008c8ff12c198162ff
-  data.tar.gz: 50a456aab2431ca613b0233f92bb05ba8a4435fae29d26812b00d87b87d0bdfa9ebfbd0602e894fcb3e241e7e9e4db7924abdc2667d4b35840928987f9551f21
+  metadata.gz: 97ae9198f3b4dd04d6b4d22c7642f8c8fb6a283586637a9c6088fa2b0c0223f7324fd5e3098689bd633e3c0447764f5b36b8976ad8d137a74e33b6ad4c81819f
+  data.tar.gz: abdbb1ac3a7bd00f85a59ea693c89efc42d00a32ce047fb8355834e95ec9c0ed647a497962c3c551b1bbadf998e7d8d37a8a0dddd8e1989f61ac1050f2c586b7

data/lib/translation_io/client/base_operation/save_special_yaml_files_step.rb

@@ -24,20 +24,16 @@ module TranslationIO
             TranslationIO::YamlEntry.localization?(key, value)
           end
 
-          source_flat_special_translations = all_flat_special_translations.select do |key|
-            TranslationIO::YamlEntry.from_locale?(key, @source_locale) && !TranslationIO::YamlEntry.ignored?(key)
-          end
-
           @target_locales.each do |target_locale|
             yaml_path = File.join(@yaml_locales_path, "localization.#{target_locale}.yml")
 
             TranslationIO.info yaml_path, 2, 2
 
-            flat_translations = all_flat_special_translations.select do |key|
+            target_flat_special_translations = all_flat_special_translations.select do |key|
               TranslationIO::YamlEntry.from_locale?(key, target_locale) && !TranslationIO::YamlEntry.ignored?(key)
             end
 
-            yaml_data = YAMLConversion.get_yaml_data_from_flat_translations(flat_translations)
+            yaml_data = YAMLConversion.get_yaml_data_from_flat_translations(target_flat_special_translations)
 
             File.open(yaml_path, 'wb') do |file|
               file.write(yaml_data)

data/lib/translation_io/client/init_operation/update_pot_file_step.rb

@@ -7,10 +7,17 @@ module TranslationIO
           @source_files = source_files
         end
 
-        def run
+        def run(params)
           TranslationIO.info "Updating POT file."
           FileUtils.mkdir_p(File.dirname(@pot_path))
-          GetText::Tools::XGetText.run(*@source_files, '-o', @pot_path, '--msgid-bugs-address', 'contact@translation.io',)
+          GetText::Tools::XGetText.run(*@source_files, '-o', @pot_path,
+                                       '--msgid-bugs-address', TranslationIO.config.pot_msgid_bugs_address,
+                                       '--package-name',       TranslationIO.config.pot_package_name,
+                                       '--package-version',    TranslationIO.config.pot_package_version,
+                                       '--copyright-holder',   TranslationIO.config.pot_copyright_holder,
+                                       '--copyright-year',     TranslationIO.config.pot_copyright_year.to_s)
+
+          params["pot_data"] = File.read(@pot_path)
         end
       end
     end

data/lib/translation_io/client/init_operation.rb

@@ -23,7 +23,7 @@ module TranslationIO
         yaml_locales_path = config.yaml_locales_path
         yaml_file_paths   = config.yaml_file_paths
 
-        UpdatePotFileStep.new(pot_path, source_files).run
+        UpdatePotFileStep.new(pot_path, source_files).run(params)
         UpdateAndCollectPoFilesStep.new(target_locales, pot_path, locales_path).run(params)
         CreateYamlPoFilesStep.new(source_locale, target_locales, yaml_file_paths).run(params)
 

data/lib/translation_io/client/sync_operation/update_and_collect_pot_file_step.rb

@@ -9,7 +9,13 @@ module TranslationIO
 
         def run(params)
           TranslationIO.info "Updating POT file."
-          GetText::Tools::XGetText.run(*@source_files, '-o', @pot_path)
+          GetText::Tools::XGetText.run(*@source_files, '-o', @pot_path,
+                                       '--msgid-bugs-address', TranslationIO.config.pot_msgid_bugs_address,
+                                       '--package-name',       TranslationIO.config.pot_package_name,
+                                       '--package-version',    TranslationIO.config.pot_package_version,
+                                       '--copyright-holder',   TranslationIO.config.pot_copyright_holder,
+                                       '--copyright-year',     TranslationIO.config.pot_copyright_year.to_s)
+
           params['pot_data'] = File.read(@pot_path)
         end
       end

data/lib/translation_io/config.rb

@@ -9,6 +9,12 @@ module TranslationIO
     attr_accessor :localization_key_prefixes
     attr_accessor :charset
 
+    attr_accessor :pot_msgid_bugs_address
+    attr_accessor :pot_package_name
+    attr_accessor :pot_package_version
+    attr_accessor :pot_copyright_holder
+    attr_accessor :pot_copyright_year
+
     def initialize
       self.locales_path              = File.join('config', 'locales', 'gettext')
       self.source_locale             = :en
@@ -19,6 +25,12 @@ module TranslationIO
       self.ignored_key_prefixes      = []
       self.localization_key_prefixes = []
       self.charset                   = 'UTF-8'
+
+      self.pot_msgid_bugs_address = 'contact@translation.io'
+      self.pot_package_name       = File.basename(Dir.pwd)
+      self.pot_package_version    = '1.0'
+      self.pot_copyright_holder   = File.basename(Dir.pwd)
+      self.pot_copyright_year     = Date.today.year
     end
 
     def pot_path

data/lib/translation_io/controller.rb

@@ -1,17 +1,27 @@
 module TranslationIO
   module Controller
     def set_locale
-      requested_locale = params[:locale]                     ||
-                         session[:locale]                    ||
-                         cookies[:locale]                    ||
-                         request.env['HTTP_ACCEPT_LANGUAGE'] ||
+      requested_locale = params[:locale]                                             ||
+                         session[:locale]                                            ||
+                         cookies[:locale]                                            ||
+                         extract_browser_locale(request.env['HTTP_ACCEPT_LANGUAGE']) ||
                          I18n.default_locale
 
       if I18n.available_locales.include?(requested_locale.to_sym)
         session[:locale] = requested_locale
         I18n.locale      = requested_locale
       else
-        redirect_to root_path(:locale => I18n.default_locale)
+        if respond_to?(:root_path)
+          redirect_to root_path(:locale => I18n.default_locale)
+        else
+          redirect_to "/?locale=#{I18n.default_locale}"
+        end
+      end
+    end
+
+    def extract_browser_locale(http_accept_language)
+      http_accept_language.to_s.scan(/[a-z]{2}(?:-[A-Z]{2})?/).detect do |candidate|
+        I18n.available_locales.include?(candidate.to_sym)
       end
     end
   end

data/lib/translation_io/flat_hash.rb

@@ -137,6 +137,9 @@ module TranslationIO
         if h.is_a?(Hash)
           h.keys.each do |key|
             if [TrueClass, FalseClass].include?(key.class)
+              # # This warning is commented because Rails admin uses bad keys: https://github.com/sferik/rails_admin/blob/master/config/locales/rails_admin.en.yml
+              # TranslationIO.info("Warning - We found some YAML protected keys in your project, they will not be synchronized: 'yes', 'no', 'y', 'n', 'on', 'off', 'true', 'false'")
+              # TranslationIO.info(h.inspect)
               h.delete(key)
             else
               remove_reserved_keys!(h[key])

data/lib/translation_io/yaml_entry.rb

@@ -58,7 +58,7 @@ module TranslationIO
         if TranslationIO.config
           IGNORED_KEY_PREFIXES + TranslationIO.config.ignored_key_prefixes
         else
-          LOCALIZATION_KEY_PREFIXES
+          IGNORED_KEY_PREFIXES
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translation
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 1.0.0
 platform: ruby
 authors:
 - Aurelien Malisart
@@ -9,12 +9,15 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gettext
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.2
@@ -22,6 +25,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.2
@@ -29,45 +35,47 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-description: Rails translation made _("simple") with YAML and GetText.
+description: Translation.io allows you to localize Rails applications using either
+  t(".keys") or _("free text"). Just type "rake translation:sync" to synchronize with
+  your translators, and let them translate online with our interface.
 email: contact@translation.io
 executables: []
 extensions: []