gettext-setup 0.16 → 0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49df38cdb7e32dbfe0aec6c12460aa5b5ea26f85
-  data.tar.gz: fbed21a4922999e95f06962024d5967d07d5c064
+  metadata.gz: 51e24d5a0de0289dfab4f0013cffdd6c753a97f5
+  data.tar.gz: 56b6f3143b3be413900d8fac7d409e53b9eb886a
 SHA512:
-  metadata.gz: aa1b607f4692eb1b2d489c027f9ac6042c0ed9140bd48690777d267e4905cd2727a7cd7b1a467d6c03d9c2aca58c1207f9e3cceda77e4bc4467a059f637d6805
-  data.tar.gz: 6d3b4954a99628ad36e6fbb414ab0ed2b068a3f2224c40287779c1ee67eeb62c43f7f5f14ffd7f3bad55821bcc62ddefa8676dc49cba2033b0108b7957507f2e
+  metadata.gz: 4b8877f0d9a611c1af3c8bd01e14d1e513cee3a8f8dd65397f9be38ce08fd98880ee09535d5c4a68f6f9780746e37a14704e4140e758da22c7da155b5e76cf48
+  data.tar.gz: 3f30f76c29b8e1da5a2a87b43e9e1c1ad83192974b13d05281620b20e549900361812c2f825c06e15a93f7f064f019c10f89229afd76eb2a9ed55319917dcdc2

data/lib/gettext-setup/gettext_setup.rb

@@ -5,6 +5,8 @@ require 'locale'
 
 module GettextSetup
   @@config = nil
+  @@translation_repositories = {}
+  FastGettext.default_available_locales = []
 
   # `locales_path` should include:
   # - config.yaml
@@ -24,19 +26,28 @@ module GettextSetup
     # Define our text domain, and set the path into our root.  I would prefer to
     # have something smarter, but we really want this up earlier even than our
     # config loading happens so that errors there can be translated.
-    FastGettext.add_text_domain(config['project_name'],
-                                :path => locales_path,
-                                :type => options[:file_format] || :po,
-                                :ignore_fuzzy => false)
-    FastGettext.default_text_domain = config['project_name']
+    add_repository_to_chain(config['project_name'], options)
+
+    # 'chain' is the only available multi-domain type in fast_gettext 1.1.0 We should consider
+    # investigating 'merge' once we can bump our dependency
+    FastGettext.add_text_domain('master_domain', type: :chain, chain: @@translation_repositories.values)
+    FastGettext.default_text_domain = 'master_domain'
 
     # Likewise, be explicit in our default language choice.
     FastGettext.default_locale = default_locale
-    FastGettext.default_available_locales = locales
+    FastGettext.default_available_locales = FastGettext.default_available_locales | locales
 
     Locale.set_default(default_locale)
   end
 
+  def self.add_repository_to_chain(project_name,options)
+    repository = FastGettext::TranslationRepository.build(project_name,
+                                                          :path => locales_path,
+                                                          :type => options[:file_format] || :po,
+                                                          :ignore_fuzzy => false)
+    @@translation_repositories[project_name] = repository unless @@translation_repositories.key? project_name
+  end
+
   def self.locales_path
     @@locales_path
   end
@@ -45,6 +56,10 @@ module GettextSetup
     @@config ||= {}
   end
 
+  def self.translation_repositories
+    @@translation_repositories
+  end
+
   def self.default_locale
     config['default_locale'] || "en"
   end
@@ -86,12 +101,12 @@ module GettextSetup
       pair[0] = FastGettext.default_locale if pair[0] == '*'
       pair
     end.sort_by do |(locale,qvalue)|
-      qvalue.to_f
+      -1 * qvalue.to_f
     end.select do |(locale,_)|
       FastGettext.available_locales.include?(locale)
     end
-    if available_locales and available_locales.last
-      available_locales.last.first
+    if available_locales and available_locales.first
+      available_locales.first.first
     else
       # We can't satisfy the request preference. Just use the default locale.
       default_locale

data/lib/tasks/gettext.rake

@@ -66,13 +66,18 @@ namespace :gettext do
       old_pot = pot_file_path + ".old"
       File.rename(pot_file_path, old_pot)
       generate_new_pot
-      stdout, stderr, status = Open3.capture3("msgcmp --use-untranslated '#{old_pot}' '#{pot_file_path}'")
-      if status == 1 || /this message is not used/.match(stderr)
+      begin
+        _, stderr, status = Open3.capture3("msgcmp --use-untranslated '#{old_pot}' '#{pot_file_path}'")
+        if status == 1 || /this message is not used/.match(stderr)
+          File.delete(old_pot)
+          puts "String changes detected, replacing with updated POT file"
+        else
+          puts "No string changes detected, keeping old POT file"
+          File.rename(old_pot, pot_file_path)
+        end
+      rescue IOError
+        # Ignore; probably means msgcmp isn't installed.
         File.delete(old_pot)
-        puts "String changes detected, replacing with updated POT file"
-      else
-        puts "No string changes detected, keeping old POT file"
-        File.rename(old_pot, pot_file_path)
       end
     end
   end

data/spec/fixtures/alt_locales/alt_locales.pot

@@ -0,0 +1,25 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2016 Puppet Labs, LLC.
+# This file is distributed under the same license as the Sinatra i18n demo package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: alt_locales init-11-ga532a06\n"
+"\n"
+"Report-Msgid-Bugs-To: docs@puppetlabs.com\n"
+"POT-Creation-Date: 2016-06-07 17:38-0500\n"
+"PO-Revision-Date: 2016-06-07 17:38-0500\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#. GettextSetup.initialize(File::join(File::dirname(File::dirname(__FILE__)), 'fixtures'))
+#: ../../lib/gettext_setup_spec.rb:25
+msgid "Hello, world!"
+msgstr ""

data/spec/fixtures/alt_locales/config.yaml

@@ -0,0 +1,22 @@
+---
+# This is the project-specific configuration file for setting up
+# fast_gettext for your project.
+gettext:
+  # This is used for the name of the .pot and .po files; they will be
+  # called <project_name>.pot?
+  project_name: 'alt_locales'
+  # This is used in comments in the .pot and .po files to indicate what
+  # project the files belong to and should bea little more desctiptive than
+  # <project_name>
+  package_name: alt_locales
+  # The locale that the default messages in the .pot file are in
+  default_locale: en
+  # The email used for sending bug reports.
+  bugs_address: docs@puppetlabs.com
+  # The holder of the copyright.
+  copyright_holder: Puppet Labs, LLC.
+  # Patterns for +Dir.glob+ used to find all files that might contain
+  # translatable content, relative to the project root directory
+  source_files:
+    - 'test_translation.rb'
+    - '../lib/**/*.rb'

data/spec/fixtures/alt_locales/jp/alt_locales.po

@@ -0,0 +1,23 @@
+# German translations for Sinatra i18n demo package.
+# Copyright (C) 2016 Puppet Labs, LLC.
+# This file is distributed under the same license as the Sinatra i18n demo package.
+# Automatically generated, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Sinatra i18n demo \n"
+"Report-Msgid-Bugs-To: docs@puppetlabs.com\n"
+"POT-Creation-Date: 2016-04-05 10:39-0700\n"
+"PO-Revision-Date: 2016-02-26 18:21-0800\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: jp\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../app.rb:14
+msgid "Hello, world!"
+msgstr "こんにちは世界"
+

data/spec/lib/gettext_setup_spec.rb

@@ -31,6 +31,9 @@ describe GettextSetup do
       expect(GettextSetup.negotiate_locale('en;q=1, de;q=2')).to eq('de')
       expect(GettextSetup.negotiate_locale('en;q=1, de;q=0')).to eq('en')
     end
+    it "chooses the first value when q values are equal" do
+      expect(GettextSetup.negotiate_locale('de;q=1, en;q=1')).to eq('de')
+    end
   end
   context 'set_default_locale' do
     before :each do
@@ -45,10 +48,51 @@ describe GettextSetup do
   context 'clear' do
     it "can clear the locale" do
       expect(GettextSetup.default_locale).to eq('en')
-      expect(GettextSetup.candidate_locales).to eq('en_US,en')
+      expect(GettextSetup.candidate_locales).to include('en')
       GettextSetup.clear
       ENV['LANG'] = 'de_DE'
       expect(GettextSetup.candidate_locales).to eq('de_DE,de,en')
     end
   end
+  context 'multiple locales' do
+    # locales/ loads the de locale and alt_locales/ loads the jp locale
+    before(:all) do
+      GettextSetup.initialize(File::join(File::dirname(File::dirname(__FILE__)), 'fixtures', 'alt_locales'))
+    end
+    it 'can aggregate locales across projects' do
+      expect(FastGettext.default_available_locales).to include('en','de','jp')
+    end
+    it 'can switch to loaded locale' do
+      FastGettext.locale = GettextSetup.negotiate_locale('de,en')
+      expect(FastGettext.locale).to eq('de')
+      FastGettext.locale = GettextSetup.negotiate_locale('jp')
+      expect(FastGettext.locale).to eq('jp')
+    end
+  end
+  context 'translation repository chain' do
+    before(:all) do
+      GettextSetup.initialize(File::join(File::dirname(File::dirname(__FILE__)), 'fixtures', 'alt_locales'))
+    end
+    it 'chain is not nil' do
+      expect(GettextSetup.translation_repositories).not_to be_nil
+    end
+    it 'can translate without switching text domains' do
+      FastGettext.locale = "de"
+      expect(_('Hello, world!')).to eq('Hallo, Welt!')
+      FastGettext.locale = "jp"
+      expect(_('Hello, world!')).to eq('こんにちは世界')
+    end
+    it 'does not allow duplicate repositories' do
+      GettextSetup.initialize(File::join(File::dirname(File::dirname(__FILE__)), 'fixtures', 'alt_locales'))
+      repos = GettextSetup.translation_repositories
+      expect(repos.select { |k,v| k == 'alt_locales' }.size).to eq(1)
+    end
+    it 'does allow multiple unique domains' do
+      GettextSetup.initialize(File::join(File::dirname(File::dirname(__FILE__)), 'fixtures', 'locales'))
+      repos = GettextSetup.translation_repositories
+      expect(repos.size) == 2
+      expect(repos.select { |k,v| k == 'alt_locales' }.size).to eq(1)
+      expect(repos.select { |k,v| k == 'sinatra-i18n' }.size).to eq(1)
+    end
+  end
 end

metadata

@@ -1,181 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: gettext-setup
 version: !ruby/object:Gem::Version
-  version: '0.16'
+  version: '0.17'
 platform: ruby
 authors:
 - Puppet
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-11 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: fast_gettext
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
-  name: gettext
-  prerelease: false
+        version: 1.1.0
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
+  name: locale
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
-  name: fast_gettext
-  prerelease: false
+        version: '0'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  name: locale
+        version: '1.3'
+  type: :development
   prerelease: false
-  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
+  name: gettext
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
-  name: bundler
-  prerelease: false
+        version: 3.0.2
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rack-test
-  prerelease: false
   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: '3.1'
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
+  name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-  name: rspec-core
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
+  name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-  name: rspec-expectations
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
+  name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-  name: rspec-mocks
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: simplecov
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: webmock
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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: A gem to ease i18n
@@ -191,6 +205,9 @@ files:
 - lib/gettext-setup/gettext_setup.rb
 - lib/tasks/gettext.rake
 - locales/config-sample.yaml
+- spec/fixtures/alt_locales/alt_locales.pot
+- spec/fixtures/alt_locales/config.yaml
+- spec/fixtures/alt_locales/jp/alt_locales.po
 - spec/fixtures/locales/config.yaml
 - spec/fixtures/locales/de/sinatra-i18n.po
 - spec/fixtures/locales/sinatra-i18n.pot
@@ -200,29 +217,33 @@ homepage: https://github.com/puppetlabs/gettext-setup-gem
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.5
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
 specification_version: 4
 summary: A gem to ease internationalization with fast_gettext
 test_files:
-- spec/spec_helper.rb
+- spec/fixtures/alt_locales/alt_locales.pot
+- spec/fixtures/alt_locales/config.yaml
+- spec/fixtures/alt_locales/jp/alt_locales.po
 - spec/fixtures/locales/config.yaml
-- spec/fixtures/locales/sinatra-i18n.pot
 - spec/fixtures/locales/de/sinatra-i18n.po
+- spec/fixtures/locales/sinatra-i18n.pot
 - spec/lib/gettext_setup_spec.rb
+- spec/spec_helper.rb
+has_rdoc: