translation 1.19 → 1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff2388659bd454e1ff1cbcad7133161a66902007d08e4735b80c628289665c15
-  data.tar.gz: d9a4222b6014f21dc2b29cc9de1afb60d725301d6d93a9cd7f0ba5b0cbc8d2e8
+  metadata.gz: 39f833e4f98c4424feca4172a7f70c3b9639f24df3aaaa8e873632a54a5bb290
+  data.tar.gz: c76f080ced71805a079f47f6475412f1a1f4b24574e6470e77aa0d924ffd4211
 SHA512:
-  metadata.gz: 917f60afd4befcabb144943a3b9ebd26d2d4cd372ef286432d0bc0c03aafc9aff6bae7e4b956abcc11506f35be33e752cd011ff10f1b8a7b77e84038a0bf783f
-  data.tar.gz: 8a9b12a2c66a7f060f2861150ad171ab4ebeb94b87fb18bc4763c2529871f8b58963c221cd9844844a3ef56dd9e4e32c262cf85b5df751a650f19e97e0de2a7e
+  metadata.gz: 40fb09a74db12309e1dc787cc9ced44874cbc96250d6eb62cafe6b8f63962557756560f70c64f33e0e520a12a87bff14809b04b8a86c593fe4c1f48363977272
+  data.tar.gz: 834e92a56f1d11c178905db2326e346f9108f3237bf83645a59605680344878f15a9c79d5d22295fa05804fc3374942b7999852848affb82dfa55c1f5057b5dc

data/README.md

@@ -204,20 +204,23 @@ Since you created a new project, the translation history and tags will unfortuna
 
 ### Custom Languages
 
-You may want to add a custom language that is derived from an existing language.
-It's useful if you want to change some translations for another instance of the
-application or for a specific customer.
+A custom language is always derived from an existing language. It's useful if you want
+to adapt some translations to another instance of your application, or to a specific
+customer.
 
-The structure of a custom language is : existing language code + "-" + custom text.
+The structure of a custom language is: `existing language code` + `-` + `custom text`, where
+`custom text` can only contain alphanumeric characters and `-`.
 
 Examples: `en-microsoft` or `fr-BE-custom`.
 
-Custom languages can be added like any other language and fallbacks work as expected.
-It means that if the `en-microsoft.some_key` is missing, then it will fallback to
-`en.some_key`. So you only need to translate keys that should be customized.
+Custom languages can be added and used like any other language.
 
-Note that fallback are chained, so `fr-be-custom` will fallback to `fr-be` that will
-itself fallback to `fr`.
+Fallbacks work as expected. It means that if the `en-microsoft.some_key` is missing,
+then it will fallback to `en.some_key`. So you only need to translate keys that
+should be customized.
+
+Note that fallback are chained, so `fr-BE-custom` will fallback to `fr-BE` that will
+fallback to `fr`.
 
 Using GetText syntax, it will only fallback to the source language. So either you
 create a fallback mechanism by yourself or you avoid fallbacking
@@ -237,9 +240,12 @@ class ApplicationController < ActionController::Base
 end
 ```
 
-It will automatically set the locale extracted from the user's browser `HTTP_ACCEPT_LANGUAGE` value, and keep it in the session between requests.
+First time the user will connect, it will automatically set the locale extracted
+from the user's browser `HTTP_ACCEPT_LANGUAGE` value, and keep it in the session between
+requests.
 
-Update the current locale by redirecting the user to https://yourdomain.com?locale=fr or even https://yourdomain.com/fr if you scoped your routes like this:
+Update the current locale by redirecting the user to https://yourdomain.com?locale=fr
+or even https://yourdomain.com/fr if you scoped your routes like this:
 
 ```ruby
 scope "/:locale", :constraints => { locale: /[a-z]{2}/ } do
@@ -247,7 +253,8 @@ scope "/:locale", :constraints => { locale: /[a-z]{2}/ } do
 end
 ```
 
-The `set_locale` code is [here](https://github.com/translation/rails/blob/master/lib/translation_io/controller.rb#L3), feel free to override it with your own locale management.
+The `set_locale` code is [here](https://github.com/translation/rails/blob/master/lib/translation_io/controller.rb#L3),
+feel free to override it with your own locale management.
 
 Don't forget to define your available locales with [I18n.available_locales](http://guides.rubyonrails.org/i18n.html#setup-the-rails-application-for-internationalization).
 

data/lib/translation_io/yaml_entry.rb

@@ -31,7 +31,7 @@ module TranslationIO
       end
 
       def ignored?(key)
-        key.present? && ignored_key_prefixes.any? { |p| key_without_locale(key).match(/^#{p}\b/) != nil }
+        key.present? && ignored_key_prefixes.any? { |prefix| key_without_locale(key).match(/^#{Regexp.escape(prefix)}\b/) != nil }
       end
 
       def localization?(key, value)
@@ -40,7 +40,7 @@ module TranslationIO
 
       def localization_prefix?(key)
         localization_key_prefixes.any? do |prefix|
-          key_without_locale(key).match(/^#{prefix}\b/) != nil
+          key_without_locale(key).match(/^#{Regexp.escape(prefix)}\b/) != nil
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translation
 version: !ruby/object:Gem::Version
-  version: '1.19'
+  version: '1.20'
 platform: ruby
 authors:
 - Michael Hoste
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-13 00:00:00.000000000 Z
+date: 2019-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gettext