gettext-setup 0.29 → 0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8da8fd9251397ed014f16b48dea5b14640d800c
-  data.tar.gz: d627fbab3ccae583c2762a035138446afb01648e
+  metadata.gz: 55e7c36131dbc622484fd2d752352dc235c82cf7
+  data.tar.gz: ef5a82547c41f8336cbcaa251ba4e1c0a0278d89
 SHA512:
-  metadata.gz: 1e628881df88dfc63c0626b1aa807175c8a3d9cb12a42da9e10fef82beb7fd8fb7b7e3f7c4c032eeea1cf58397eccdb9bf8da94f34174a4d810d07c6ab839b56
-  data.tar.gz: 22de28a46e580a41f0e8322b0ebf88349f8de4ac46124537b579d8406ce837a0ebd52cb8021765e59a1879fb9981f6fc4e54dbddde3396b4477300ae3b74dbcf
+  metadata.gz: 634692fe3c69bc1ab9dca17f1460dc3013ac32054757c7553531e316dd7de6fbe937396d898db50cfb155d3315bb6119c000642f07e15fd5862dd803f5f4e335
+  data.tar.gz: 9e9b644e6baa63327de33e7ce2ca46cebeda5533f28acea6cc9afc47289065db878c9d2a28672b0e7762b50fad2bc8218f09a27b1702268d2dc09df7c667602b

data/README.md

@@ -1,6 +1,6 @@
 # gettext-setup gem
 
-This is a simple gem to set up i18n for Ruby projects (including [Sinatra](www.sinatrarb.com/) web apps) using gettext and fast gettext.
+This is a simple gem to set up i18n for Ruby projects (including [Sinatra](http://www.sinatrarb.com/) web apps) using gettext and fast gettext.
 
 This project sets the default locale to English. If the user has set a different locale in their browser preferences, and we support the user's preferred locale, strings and data formatting will be customized for that locale.
 
@@ -16,34 +16,34 @@ This project sets the default locale to English. If the user has set a different
 
 ## Setup for your project
 
-These are the poignant bits of this example that you need to replicate in
-your project:
+These are the poignant bits of this example that you need to replicate in your project:
 
 1. Add `gem 'gettext-setup'` to your `Gemfile`.
-1. Copy `locales/config-sample.yaml` to your project and put it into a
+2. Copy `locales/config-sample.yaml` to your project and put it into a
 `locales` directory as `config.yaml`.
-1. Edit `locales/config.yaml` and make the necessary changes for your
-   project
-1. Add these three lines to your `Rakefile`, ensuring the `locales`
-   directory is found by the last line:
-```
-    spec = Gem::Specification.find_by_name 'gettext-setup'
-    load "#{spec.gem_dir}/lib/tasks/gettext.rake"
-    GettextSetup.initialize(File.absolute_path('locales', File.dirname(__FILE__)))
-```
-1. Add these lines at the start of your app (`app.rb` for server-side, the executable binary for CLI applications):
-    `require 'gettext-setup'`
-    `GettextSetup.initialize(File.absolute_path('locales', File.dirname(__FILE__)))`
-    (Note that the second line may require modification to find the `locales` directory.
-1. For client-side applications, add this line:
-    `GettextSetup.negotiate_locale!(GettextSetup.candidate_locales)`
-1. For server-side applications, add these lines:
-```
-    before do
-      GettextSetup.negotiate_locale!(env["HTTP_ACCEPT_LANGUAGE"])
-    end
-```
-
+3. Edit `locales/config.yaml` and make the necessary changes for your project
+4. Add these three lines to your `Rakefile`, ensuring the `locales` directory is found by the last line:
+   ```ruby
+   spec = Gem::Specification.find_by_name 'gettext-setup'
+   load "#{spec.gem_dir}/lib/tasks/gettext.rake"
+   GettextSetup.initialize(File.absolute_path('locales', File.dirname(__FILE__)))
+   ```
+5. Add these lines at the start of your app (`app.rb` for server-side, the executable binary for CLI applications):
+   ```ruby
+   require 'gettext-setup'
+   GettextSetup.initialize(File.absolute_path('locales', File.dirname(__FILE__)))
+   ```
+   Note that the second line may require modification to find the `locales` directory.
+6. For client-side applications, add this line:
+   ```ruby
+   GettextSetup.negotiate_locale!(GettextSetup.candidate_locales)
+   ```
+7. For server-side applications, add these lines:
+   ```ruby
+   before do
+       GettextSetup.negotiate_locale!(env["HTTP_ACCEPT_LANGUAGE"])
+   end
+    ```
 ## Writing translatable code
 
 ### Use full sentences
@@ -67,13 +67,16 @@ E.g. `n_("There is %{count} bicycle in %{city}", "There are %{count} bicycles in
 
 Pluralization rules vary across languages. The pluralization rules are specified in the PO file and look something like this `Plural-Forms: nplurals=2; plural=(n > 1);`. This is the pluralization rule for German. It means that German has two pluralization rules. The first rule is `plural=n > 1)` and the second rule is all other counts.
 
-Plurals are selected from the PO file by index. Here's an example of how a
-pluralized string is handled in a PO file:
+Plurals are selected from the PO file by index. 
+
+Here's an example of how a pluralized string is handled in a PO file:
 
-`msgid "%{count} file"
-`msgid_plural "%{count} files"
-`msgstr[0] "%{count} Dateien"
-`msgstr[1] "%{count} Datei"
+```
+msgid "%{count} file"
+msgid_plural "%{count} files"
+msgstr[0] "%{count} Dateien"
+msgstr[1] "%{count} Datei"
+```
 
 The `msgid` is the singular version of the English source string that's pulled in to the POT file and PO from the code file.
 
@@ -102,11 +105,11 @@ E.g. `#. The placeholder in this string represents the name of a parameter.`
 
 ## Merge Pot files rake task
 
-The rake task that merges .pot files is present for the internationalisation of a module. This task uses 'msgcat', which is only natively present on OSes that are GNU based. For running this task locally on another OS you will need to download the gettext pkg and install it locally:
+The rake task that merges .pot files is present for the internationalisation of a module. This task uses 'msgcat', which is only natively present on OSes that are GNU based. For running this task locally on another OS, you will need to download the gettext pkg and install it locally:
 https://pkgs.org/download/gettext
 
 This task will run within the gettext setup locales_path provided by GettextSetup. The result will be a merged pot file created from all pot files kept in this location.
 
-By default the merged pot file is locales_path/project_name.pot. This can be overridden when calling the method by providing a chosen path.
+By default, the merged pot file is locales_path/project_name.pot. This can be overridden when calling the method by providing a chosen path.
 
 Please note: Since the default merged file name is project_name.pot, it will override anything of that name within the locales directory.

data/lib/gettext-setup/gettext_setup.rb

@@ -11,7 +11,6 @@ module GettextSetup
 
   @config = nil
   @translation_repositories = {}
-  FastGettext.default_available_locales = []
 
   # `locales_path` should include:
   # - config.yaml
@@ -36,9 +35,11 @@ module GettextSetup
     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.
+    # Likewise, be explicit in our default language choice. Available locales
+    # must be set prior to setting the default_locale since default locale must
+    # available.
+    FastGettext.default_available_locales = (FastGettext.default_available_locales || []) | locales
     FastGettext.default_locale = default_locale
-    FastGettext.default_available_locales = FastGettext.default_available_locales | locales
 
     Locale.set_default(default_locale)
   end

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

@@ -10,6 +10,15 @@ describe GettextSetup do
   before(:each) do
     GettextSetup.initialize(locales_path)
   end
+  after(:each) do
+    FastGettext.default_text_domain = nil
+    FastGettext.default_available_locales = nil
+    FastGettext.default_locale = nil
+
+    FastGettext.text_domain = nil
+    FastGettext.available_locales = nil
+    FastGettext.locale = nil
+  end
   let(:config) do
     GettextSetup.config
   end
@@ -79,7 +88,7 @@ describe GettextSetup do
   end
   context 'multiple locales' do
     # locales/ loads the de locale and fixture_locales/ loads the jp locale
-    before(:all) do
+    before(:each) do
       GettextSetup.initialize(fixture_locales_path)
     end
     it 'can aggregate locales across projects' do
@@ -95,7 +104,7 @@ describe GettextSetup do
     end
   end
   context 'translation repository chain' do
-    before(:all) do
+    before(:each) do
       GettextSetup.initialize(fixture_locales_path)
     end
     it 'chain is not nil' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gettext-setup
 version: !ruby/object:Gem::Version
-  version: '0.29'
+  version: '0.30'
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2018-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_gettext