fast_gettext 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b7df1ae6f9c9acae6fe82a22b0ce3efd1d545c9d814447070ebb59652a7fd71
-  data.tar.gz: 05af6efd5f93f5ea8bf2f8be7314566d0238781f7d809799823223ec01866ce4
+  metadata.gz: 91bc0d49ead2bfbfad8065858e52255dfcd9938cb547f0b20984bb12cc202380
+  data.tar.gz: 45c2e546d2041e36b82a4d82593d4b1c014d46da561996037a76d6e911ed2cdb
 SHA512:
-  metadata.gz: b0df4b37e9837b4661cf7c0cbef1c75144c3c2804b2da4110a4850c08eb3084a91cd419ffb5c796eff30ee96860d87cb555a3cb2bd3e99e25db64731868a08ff
-  data.tar.gz: dc6f882c3c3fa4ea1c3fc2399077d149c3e981124de8f9da99e0ee7bdf2fd248ac74131cc92f9167d05ef15a04eb2ba4e25780ea1f8bc9ecfe04795776704310
+  metadata.gz: 1120024578b173fb99e2bf879b22654723efede889a98d7d950c8201aef11261566f6c70a6247f8ce937fef9f7ec88fe1a6dc9a874331e6cc41fbed55cc651f2
+  data.tar.gz: 6cdbf2dcec813b6fb0c0da4b87af33c372a2f87ea177fdafd0203cf3f45f565a5fe64b4e41fe4fedcd4450ec1a7196d4c5a015df35470b4cfdb8b21e4037b137

data/Readme.md

@@ -95,8 +95,8 @@ FastGettext.locale = 'de'
 
 ### 4. Start translating
 
-FastGetText supports all the translation methods of [ruby-gettext](http://github.com/ruby-gettext/gettext) with added support for block defaults.
-(to get `*gettext` methods, use `FastGetText::TranslationAliased`)
+FastGettext supports all the translation methods of [ruby-gettext](http://github.com/ruby-gettext/gettext) with added support for block defaults.
+(to get `*gettext` methods, use `FastGettext::TranslationAliased`)
 
 #### `_()` or `gettext()`: basic translation
 
@@ -116,7 +116,7 @@ n_('Car', 'Cars', 2) == 'Autos' # German plural of Cars
 You'll often want to interpolate the results of `n_()` using ruby builtin `%` operator.
 
 ```ruby
-n_('Car', '#{n} Cars', 2) % { n: count } == '2 Autos'
+n_('Car', '%{n} Cars', 2) % { n: count } == '2 Autos'
 ```
 
 #### `p_()` or `pgettext()`: translation with context
@@ -126,7 +126,7 @@ p_('File', 'Open') == _("File\004Open") == "öffnen"
 p_('Context', 'not-found') == 'not-found'
 ```
 
-#### `s_()` or `sgetext()`: translation with namespace
+#### `s_()` or `sgettext()`: translation with namespace
 
 ```ruby
 s_('File|Open') == _('File|Open') == "öffnen"
@@ -153,13 +153,13 @@ sn_('Fruit|Apple', 'Apples', 1) == 'Apfel'
 
 #### `N_()` and `Nn_()`: make dynamic translations available to the parser.
 
-In many instances, your strings will not be found the by the ruby-parse. These methods
+In many instances, your strings will not be found by the ruby parsing. These methods
 allow for those strings to be discovered.
 
 ```
 N_("active"); N_("inactive"); N_("paused") # possible value of status for parser to find.
 Nn_("active", "inactive", "paused")        # alternative method
-_("Your account is #{account_state}.") % { account_state: status }
+_("Your account is %{account_state}.") % { account_state: _(status) }
 ```
 
 
@@ -180,7 +180,7 @@ Use the [original GetText](http://github.com/ruby-gettext/gettext) to create and
 
 ### Database
 [Example migration for ActiveRecord](http://github.com/grosser/fast_gettext/blob/master/examples/db/migration.rb)<br/>
-The default plural separator is `||||` but you may overwrite it (or suggest a better one..).
+The default plural separator is `||||` but you may overwrite it (or suggest a better one...).
 
 This is usable with any model DataMapper/Sequel or any other(non-database) backend, the only thing you need to do is respond to the self.translation(key, locale) call.
 If you want to use your own models, have a look at the [default models](http://github.com/grosser/fast_gettext/tree/master/lib/fast_gettext/translation_repository/db_models) to see what you want/need to implement.
@@ -305,7 +305,7 @@ Unfound may not always mean missing, if you choose not to translate a word becau
 A lambda or anything that responds to `call` will do as callback. A good starting point may be `examples/missing_translations_logger.rb`.
 
 ### Plugins
-Want a xml version ?
+Want an xml version?
 Write your own TranslationRepository!
 
 ```Ruby
@@ -362,7 +362,7 @@ Alternatively you can use [merge repository](https://github.com/grosser/fast_get
 
 #### Block defaults
 
-All the translation methods (includ MultiDomain) support a block default, a feature not provided by ruby-gettext.  When a translation is
+All the translation methods (including MultiDomain) support a block default, a feature not provided by ruby-gettext.  When a translation is
 not found, if a block is provided the block is always returned. Otherwise, a key is returned. Methods doing pluralization will attempt a simple translation of alternate keys.
 
 ```ruby
@@ -422,4 +422,4 @@ Mo/Po-file parsing from Masao Mutoh, see vendor/README
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>
 License: MIT, some vendor parts under the same license terms as Ruby (see headers)<br/>
-[![Build Status](https://travis-ci.org/grosser/fast_gettext.png)](https://travis-ci.org/grosser/fast_gettext)
+[![CI](https://github.com/grosser/fast_gettext/actions/workflows/actions.yml/badge.svg)](https://github.com/grosser/fast_gettext/actions/workflows/actions.yml)

data/lib/fast_gettext/mo_file.rb

@@ -11,6 +11,7 @@ module FastGettext
     # file => path or FastGettext::GetText::MOFile
     def initialize(file, options = {})
       @filename = file
+      @data = nil
       load_data if options[:eager_load]
     end
 

data/lib/fast_gettext/storage.rb

@@ -172,7 +172,7 @@ module FastGettext
       locales = locales.to_s.gsub(/\s/, '')
       found = [[]]
       locales.split(',').each do |part|
-        if part =~ /;q=/ # contains language and weight ?
+        if part.include? ';q=' # contains language and weight ?
           found.last << part.split(/;q=/)
           found.last.flatten!
           found << []

data/lib/fast_gettext/translation_repository/base.rb

@@ -47,7 +47,7 @@ module FastGettext
         Dir[File.join(path, '*')].each do |locale_folder|
           next unless File.basename(locale_folder) =~ LOCALE_REX
 
-          file = File.join(locale_folder, relative_file_path).untaint
+          file = File.join(locale_folder, relative_file_path)
           next unless File.exist? file
 
           locale = File.basename(locale_folder)

data/lib/fast_gettext/translation_repository/db.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'active_record'
 module FastGettext
   module TranslationRepository
     # Responsibility:
@@ -31,7 +30,7 @@ module FastGettext
       end
 
       def pluralisation_rule
-        @model.pluralsation_rule if @model.respond_to? :pluralsation_rule
+        @model.pluralisation_rule if @model.respond_to? :pluralisation_rule
       end
 
       def [](key)
@@ -51,6 +50,7 @@ module FastGettext
       end
 
       def self.require_models
+        require 'active_record'
         folder = "fast_gettext/translation_repository/db_models"
         require "#{folder}/translation_key"
         require "#{folder}/translation_text"

data/lib/fast_gettext/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FastGettext
-  VERSION = Version = '2.0.0' # rubocop:disable Naming/ConstantName
+  VERSION = Version = '2.1.0' # rubocop:disable Naming/ConstantName
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_gettext
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-21 00:00:00.000000000 Z
+date: 2021-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: wwtd
-  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
@@ -195,15 +181,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.16
 signing_key: 
 specification_version: 4
 summary: A simple, fast, memory-efficient and threadsafe implementation of GetText