gettext-setup 0.25 → 0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c3a0830df4687fec36b4c6ee1deb0e0e151b342
-  data.tar.gz: 1f4b4ec5f9aee8c6aab1db042213214fb01f7560
+  metadata.gz: d76056589632a45d8d207a37b534aae61cca3aa2
+  data.tar.gz: 64c7222fcd4ef7a1f0ce2f78fe63c25f0a2e6ac5
 SHA512:
-  metadata.gz: c456950e5c6c5bc5da76098dba4163fdd026c2fbc779e5f50d6ac9ce86d8832306603ad04de9848823bf8b2c1aa224671098c786692aa85d7ed12b13e11eb76e
-  data.tar.gz: 3b53eb7cdafb53117de674dff9c464d1cf547ac529fef826b9af283bfbe1f943b07127fa1aca4e257ca7aaae762bf5b67aaff280c6736bf6e102930ae8befa86
+  metadata.gz: 664b2b64c91f93ea96ae19a3eb3add4e125d2b0dd9b5b3d9502d74845ae9f890839f66ae2fd549fac8224df0981abf8004e43a908a99ac567d9b6aa231e70729
+  data.tar.gz: 7f604a999607a42879c2975382184274f02529b2321b91a38b1cf89f52bf7bb88e55ad00108fcb7be34f1722a1315594ab2dcc1a56837a25a317c580325d1906

data/lib/generate_metadata_pot.rb

@@ -0,0 +1 @@
+require 'metadata_pot/metadata_pot'

data/lib/gettext-setup/gettext_setup.rb

@@ -112,6 +112,10 @@ module GettextSetup
     available_locales = accept_header.split(',').map do |locale|
       pair = locale.strip.split(';q=')
       pair << '1.0' unless pair.size == 2
+      # Ignore everything but the language itself; that means that we treat
+      # 'de' and 'de-DE' identical, and would use the 'de' message catalog
+      # for both.
+      pair[0] = pair[0].split('-')[0]
       pair[0] = FastGettext.default_locale if pair[0] == '*'
       pair
     end.sort_by do |(_, qvalue)|

data/lib/gettext-setup/pot.rb

@@ -72,11 +72,10 @@ module GettextSetup
     def self.generate_new_po(language, locales_path = GettextSetup.locales_path,
                              pot_file = nil, po_file = nil)
       GettextSetup.initialize(locales_path)
+      language ||= ENV['LANGUAGE']
       pot_file ||= GettextSetup::Pot.pot_file_path
       po_file ||= GettextSetup::Pot.po_file_path(language)
 
-      language ||= ENV['LANGUAGE']
-
       # Let's do some pre-verification of the environment.
       if language.nil?
         puts "You need to specify the language to add. Either 'LANGUAGE=eo rake gettext:po' or 'rake gettext:po[LANGUAGE]'"

data/spec/lib/gettext-setup/gettext_setup_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'rspec/expectations'
 require_relative '../../spec_helper'
 
@@ -35,6 +36,10 @@ 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 'ignores country variant' do
+      expect(GettextSetup.negotiate_locale('en;q=1, de-DE;q=2')).to eq('de')
+      expect(GettextSetup.negotiate_locale('en;q=1, de-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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gettext-setup
 version: !ruby/object:Gem::Version
-  version: '0.25'
+  version: '0.26'
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_gettext
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !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'
-  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
@@ -164,20 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  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: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -201,6 +173,7 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- lib/generate_metadata_pot.rb
 - lib/gettext-setup.rb
 - lib/gettext-setup/gettext_setup.rb
 - lib/gettext-setup/metadata_pot.rb
@@ -222,9 +195,6 @@ files:
 - spec/fixtures/string_changes/non_string_changes.pot
 - spec/fixtures/string_changes/old.pot
 - spec/fixtures/string_changes/remove.pot
-- spec/fixtures/tmp_locales/config.yaml
-- spec/fixtures/tmp_locales/de/sinatra-i18n.po
-- spec/fixtures/tmp_locales/sinatra-i18n.pot
 - spec/lib/gettext-setup/gettext_setup_spec.rb
 - spec/lib/gettext-setup/metadata_pot_spec.rb
 - spec/lib/gettext-setup/pot_spec.rb
@@ -250,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A gem to ease internationalization with fast_gettext
@@ -269,9 +239,6 @@ test_files:
 - spec/fixtures/string_changes/non_string_changes.pot
 - spec/fixtures/string_changes/old.pot
 - spec/fixtures/string_changes/remove.pot
-- spec/fixtures/tmp_locales/config.yaml
-- spec/fixtures/tmp_locales/de/sinatra-i18n.po
-- spec/fixtures/tmp_locales/sinatra-i18n.pot
 - spec/lib/gettext-setup/gettext_setup_spec.rb
 - spec/lib/gettext-setup/metadata_pot_spec.rb
 - spec/lib/gettext-setup/pot_spec.rb

data/spec/fixtures/tmp_locales/config.yaml

@@ -1,22 +0,0 @@
----
-# 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: 'sinatra-i18n'
-  # 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: Sinatra i18n demo
-  # 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:
-    - 'lib/**/*.rb'
-    - 'spec/**/*.rb'

data/spec/fixtures/tmp_locales/de/sinatra-i18n.po

@@ -1,23 +0,0 @@
-# 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: de\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 "Hallo, Welt!"
-

data/spec/fixtures/tmp_locales/sinatra-i18n.pot

@@ -1,40 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2017 Puppet Labs, LLC.
-# This file is distributed under the same license as the Sinatra i18n demo package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2017.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: Sinatra i18n demo 0.21-4-geccdac4\n"
-"\n"
-"Report-Msgid-Bugs-To: docs@puppetlabs.com\n"
-"POT-Creation-Date: 2017-04-11 20:08-0500\n"
-"PO-Revision-Date: 2017-04-11 20:08-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"
-
-#: ../../lib/gettext_setup_spec.rb:26 ../../lib/gettext_setup_spec.rb:89 ../../lib/gettext_setup_spec.rb:91
-msgid "Hello, world!"
-msgstr ""
-
-#: ../../lib/pot_spec.rb:52
-msgid "merged-po-file"
-msgstr ""
-
-#: ../../lib/pot_spec.rb:74
-msgid "no-pot-file"
-msgstr ""
-
-#: ../../lib/pot_spec.rb:85
-msgid "some-spec-only-string"
-msgstr ""
-
-#: ../../lib/pot_spec.rb:104
-msgid "unchanged-string"
-msgstr ""