Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: mattetti/i18n
base: master
...
head fork: svenfuchs/i18n
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Aug 30, 2012
Friedrich Delgado make sure, already cached scope is not modified, fixes issue #160 999d673
Commits on Aug 31, 2012
@svenfuchs svenfuchs Merge pull request #161 from TauPan/fix-cascade-memory-leak
make sure, already cached scope is not modified, fixes issue #160
79a4258
@svenfuchs svenfuchs Bump to 0.6.1 2553ed2
Commits on Sep 16, 2012
@henrik henrik Include the key in "missing interpolation argument" errors. efd9f1c
@tigrish tigrish Update documentation for the `pluralize` method
Hopefully made it clearer what is actually going on and why.
2b93dc9
@tigrish tigrish Merge pull request #166 from barsoom/key_in_missing_interpolation_arg…
…s_errors

Include the missing key in "missing interpolation argument" errors.
09c0aa7
Commits on Sep 24, 2012
@johnnyt johnnyt Add parens for MagLev 0aa6028
Commits on Sep 26, 2012
@tigrish tigrish Merge pull request #169 from johnnyt/maglev-fix
Add parens to fix parse error in lib/i18n.rb in MagLev
18ac029
Commits on Oct 26, 2012
@korny korny fix #158: never modify the given options hash 3627280
Commits on Dec 05, 2012
@knapo knapo Merge pull request #174 from korny/dont-modify-options-hash
Fix #158: never modify the given options hash
d9dbe2e
@knapo knapo Fix I18n.transliterate for non utf-8 keys (occurs e.g. in jruby 1.7.0…
… which have US-ASCII encoded symbols)
df79fa5
Commits on Dec 19, 2012
@grosser grosser do not overwrite response of first backend with later backends when l…
…ooking up namespaces
ee7a102
@knapo knapo Merge pull request #181 from grosser/chain-namespace-merge
do not overwrite response of first backend with later backends when looking up namespaces
a1f6552
Commits on Dec 21, 2012
@knapo knapo Fix #180 - make exception message more helpful on YAML syntax error 4de4ed4
@knapo knapo Proper catching invalid yml syntax across all ruby versions ceb40d4
@knapo knapo Remove throwing `warning: invalid start is ignored`
The last argument should be a Julian day number which denotes the day of calendar reform. Date::ITALY (2299161=1582-10-15), Date::ENGLAND (2361222=1752-09-14), Date::GREGORIAN (the proleptic Gregorian calendar) and Date::JULIAN (the proleptic Julian calendar) can be specified as a day of calendar reform
afdb973
Commits on Dec 22, 2012
@stevenweber stevenweber Preventing transliterator constant from being modified for concurrenc…
…y concerns
17c80e2
Commits on Dec 25, 2012
@tigrish tigrish Merge pull request #184 from stevenweber/master
Preventing transliterator constant from being modified for concurrency concerns
cb5a9d5
Commits on Dec 31, 2012
@knapo knapo Revert "Fix i18n/backend/key_value to add data in a array" causing va…
…rious issues.

This reverts commit e2b0fe4.
e264b76
Commits on Jan 30, 2013
@jordimassaguerpla jordimassaguerpla add license information to gemspec
This way you can get it when using rubygems.org API
8f444b5
@tigrish tigrish Merge pull request #187 from jordimassaguerpla/master
add license information to the gemspec
7d1a455
Commits on Feb 25, 2013
@jeremy jeremy Support Rails 4 92f1721
@josevalim josevalim Merge pull request #190 from jeremy/rails4
Support Rails 4
2511cb1
@josevalim josevalim Release v0.6.2 765168c
Commits on Feb 26, 2013
@knapo knapo Fix #192 - Fixed Ruby 1.8 support due to missing `String#force_encoding` d20b304
Commits on Feb 27, 2013
@josevalim josevalim Release v0.6.3 35b4490
@knapo knapo Fix #192 - resolve problems with encoding and transliterator between …
…various ruby versions.
ea81ca0
@josevalim josevalim Do not do any utf8 conversion, assume valid data is received 70fb3b6
@josevalim josevalim Release v0.6.4 53764cc
Commits on Mar 25, 2013
@jgakos jgakos Fetch dependencies from rubygems using secure https.
  - Replaces deprecated `:rubygems` source with `https://rubygems.org`
dabd644
@tigrish tigrish Merge pull request #194 from jgakos/secure_fetch_dependencies
Fetch dependencies from rubygems using secure https.
90cc914
@nashbridges nashbridges Custom handler for MissingInterpolationArgument exception c329ea2
@tigrish tigrish Merge pull request #193 from nashbridges/missing-interpolations
Custom handler for MissingInterpolationArgument exception
49fd2b3
Commits on Apr 03, 2013
@bquorning bquorning Change nbsp to regular whitespace 3ffe965
@tigrish tigrish Merge pull request #195 from bquorning/master
There's no need to have a non-breaking space in the comments
fff3037
@tricknotes tricknotes Modify filetype
- 755 -> 644

This file doesn't have to have execute authority.
422f867
Commits on Apr 05, 2013
@tigrish tigrish Merge pull request #196 from tricknotes/modify-filetype
Modify filetype
49a57e3
Commits on Apr 14, 2013
@sanemat sanemat Test against ruby2.0 in travis-ci 5ee4858
Commits on Apr 15, 2013
@tigrish tigrish Merge pull request #200 from sanemat/feature/travis-ci-ruby-2-0
Test against ruby2.0 in travis-ci
85a2678
Commits on Apr 28, 2013
@miry miry Return meridian in correct case. 5e4e30c
@tigrish tigrish Merge pull request #202 from jetthoughts/meridian_case
Return meridian in correct case.
6f4342d
Commits on May 11, 2013
@amatsuda amatsuda chmod -x lib/i18n.rb f62e641
Commits on Aug 13, 2013
@nashbridges nashbridges Simplify handling of missing interpolation argument b40df79
@josevalim josevalim Merge pull request #213 from nashbridges/simple-interpolation-missing
Simplify handling of missing interpolation argument
b22a410
@josevalim josevalim Release 0.6.5 bcec83c
@josevalim josevalim Delete unused files from repo ea8af65
Commits on Aug 15, 2013
@jeffkreeftmeijer jeffkreeftmeijer Add exists? to check if a certain key exists in the translations 93aba7a
@ndbroadbent ndbroadbent Move exists? implementation to Backend::Base, and Backend::Chain. Add…
…ed test to lib/i18n/tests/basics.rb
2e12adb
@ndbroadbent ndbroadbent Added dot-separated key tests for I18n.exists? b0ff379
Commits on Aug 21, 2013
@tigrish tigrish Merge pull request #182 from ndbroadbent/exists
Updated #69 - Add exists? to check if a certain key exists in the translations
3e53950
Commits on Dec 03, 2013
@tigrish tigrish Start a build matrix for the rails-3 gemfile f9fcd9e
@tigrish tigrish Specify all gemfiles for Travis to use 6a25ff0
@tigrish tigrish The I18n::MissingTranslation exception escapes key names for its html…
…_message

Also added deprecation message for the :rescue_format option
92b57b1
@tigrish tigrish Add I18n.locale_available? and enforce available locales
I18n.locale_available? looks for the passed locale in the
`I18n.available_locales` list.

---

Enforce available locales

When `I18n.config.enforce_available_locales` is true we'll raise an
I18n::InvalidLocale exception if the passed locale is available.

The default is set to `nil` which will display a deprecation error.

If set to `false` we'll skip enforcing available locales altogether (old behaviour).

This has been implemented in the following methods :

- I18n.config.default_locale=
- I18n.config.locale=
- I18n.translate
- I18n.localize
- I18n.transliterate
3b6e56e
@tigrish tigrish Bump version to 0.6.6 0475a22
@tigrish tigrish Remove reference to non exisiting CHANGELOG in the gemspec 86018ad
@tigrish tigrish Replace CGI.escape_html with CGI.escapeHTML which also exists in 1.8.7 68498aa
@tigrish tigrish I18n.enforce_available_locales delegates to
I18n.config.enforce_available_locales
88b643e
@tigrish tigrish Bump version to 0.6.7 95ae5a8
@tigrish tigrish Fix a naming clash between I18n.enforce_available_locales and I18n.co…
…nfig.enforce_available_locales

Renamed `I18n.enforce_available_locales` method to `I18n.enforce_available_locales!`
16904a7
@tigrish tigrish Bump version to 0.6.8 61f975b
@tigrish tigrish Tweak a few test descriptions 0de3724
Horace Williams Fix an issue with setting I18n.config.enforce_available_locales
currently setting this config to false will not stick due to
the memoize overwriting it back to nil. this probaly works ok
in many circumstances because of falsy nil, but annoyingly it
does not prevent the deprecation warning that comes along
with having the setting unconfigured.
2893ebf
@tigrish tigrish Merge pull request #223 from worace/allow-false-as-enforce_available_…
…locales-setting

Fix an issue with setting I18n.config.enforce_available_locales
48de9fe
@tigrish tigrish Bump version to 0.6.9 f00149c
Commits on Dec 07, 2013
@romuloceccon romuloceccon Test for issue with Fallbacks and enforce_available_locales
Created a test-case for an issue where the
Fallbacks module will generate an
I18n::InvalidLocale error.

Fallbacks relies on I18n.translation to find out
whether there's a translation for a fallback
locale (e.g. :'de' for :'de-DE'). But
I18n.translation does not distinguish from a
"user" call and one coming from the Fallbacks
module, and may raise I18n::InvalidLocale if
enforce_available_locales is set.
d100659
@romuloceccon romuloceccon Fixes issue with Fallbacks and enforce_available_locales
Fallbacks should check whether each fallback
location being tried was set by
store_translations before deferring to
I18n.translate. Otherwise a I18n::InvalidLocale
may be raised when enforce_available_locales is
set.
12aa0f0
Commits on Dec 12, 2013
@carlosantoniodasilva carlosantoniodasilva Fix instance variable not defined warnings due to added deprecations
Also fix the rescue_format deprecation, it seems it was never being
triggered because it was checking for the existence of a not yet defined
variable.
3d03935
Commits on Dec 15, 2013
@tigrish tigrish Merge pull request #234 from carlosantoniodasilva/ca-fix-warnings
Fix instance variable not defined warnings due to added deprecations
8fc94e7
Commits on Jan 19, 2014
@buddhamagnet buddhamagnet make code in suppress_warnings.rb more concise e8c1060
Commits on Feb 15, 2014
@semaperepelitsa semaperepelitsa I18n.locale= and default_locale= now fail given junk values.
Only strings and nil allowed.
a6ea927
Commits on Feb 22, 2014
@ssimeonov ssimeonov Ensure original verbosity in case of exceptions 31ce276
Commits on Apr 07, 2014
@arthurnn arthurnn Improve performance on enforce_available_locales!
Cache the available_locales in a local Set, so we can lookup, and check for inclusions faster.
[fixes #230]
a65fffd
Commits on Apr 30, 2014
@carlosantoniodasilva carlosantoniodasilva Merge pull request #205 from amatsuda/chmod
chmod -x lib/i18n.rb
2fa3856
Commits on May 05, 2014
@carlosantoniodasilva carlosantoniodasilva Fix typo in filename: surpress => suppress 3a582ed
@carlosantoniodasilva carlosantoniodasilva Merge pull request #241 from buddhamagnet/more-concise-suppress-warnings
Make code in suppress_warnings.rb more concise
9fd3974
@carlosantoniodasilva carlosantoniodasilva Merge pull request #245 from ssimeonov/ss_suppress_warnings
Ensure original verbosity in case of exceptions

Conflicts:
	lib/i18n/core_ext/kernel/suppress_warnings.rb
c532efd
@carlosantoniodasilva carlosantoniodasilva Get rid of unused method on test helper 3a30826
@carlosantoniodasilva carlosantoniodasilva Also return enforce_available_locales to the default nil
Since all other defaults are being reverted to the default, do that with
enforce_available_locales too.
4f996db
@carlosantoniodasilva carlosantoniodasilva Simplify store translations helper which does not make use of default…
… args
0fc31d9
@carlosantoniodasilva carlosantoniodasilva Use store translations helper in some tests 9a157af
@carlosantoniodasilva carlosantoniodasilva Stop messing up with the global namespace
Create helper methods in namespaces we own.
45e9314
@carlosantoniodasilva carlosantoniodasilva Update dependencies with: rake/mocha/test_declarative
Add rake to default Gemfile since it's a necessary dependency to run
tests.
08d7132
@carlosantoniodasilva carlosantoniodasilva Add Ruby 2.1.1 to travis be66845
@carlosantoniodasilva carlosantoniodasilva Allow failures of some rubies and gemfiles for faster feedback d7b71cf
@carlosantoniodasilva carlosantoniodasilva Add specific script/install to travis as an attempt to fix 1.8.7 buil… a345d4e
@carlosantoniodasilva carlosantoniodasilva Update dependencies of rails Gemfiles be8c11f
@carlosantoniodasilva carlosantoniodasilva Try to install tokyo cabinet ruby bindings on travis 02205ff
@carlosantoniodasilva carlosantoniodasilva Try to downgrade AS versions for now since latest ones seem to break …
…lots of tests

Due to the addition of OkJson as the default JSON backend, lots of tests
are breaking, so this is a test to see if we can get to green before
any other change.
5f60c6d
@carlosantoniodasilva carlosantoniodasilva Do not run tests with Rails 2.3.x and Ruby 2.x / RBX / JRuby
And reenable Rails 2.3 and 3.0 tests, they should be green now.
a0b4520
@carlosantoniodasilva carlosantoniodasilva Get rid of useless sqlite3 dependency on Rails gemfiles 6689c7a
Commits on May 06, 2014
@carlosantoniodasilva carlosantoniodasilva Revert "Add specific script/install to travis as an attempt to fix 1.…
…8.7 build failure"

This reverts commit a345d4e.

Conflicts:
	.travis.yml

Reason: travis Ruby build has been updated with a fix for 1.8.7 + rake.
travis-ci/travis-ci#2253 (comment)
b4a08f3
@carlosantoniodasilva carlosantoniodasilva No need to require mocha/test_unit with mocha/setup bf1f2b2
@carlosantoniodasilva carlosantoniodasilva Bump Rails 2.3/3.0 versions to latest and use Yajl as JSON backend
The Rails implementation that uses OkJson simply fails the key value
tests we have, whereas Yajl seems to work fine.

I'll leave Yajl for now to have the tests passing on latest 2.3/3.0
versions, and we can get rid of all this after removing support for
older Rails versions.
877e78e
@carlosantoniodasilva carlosantoniodasilva Add Rails 3.1, 3.2, 4.0 and 4.1 gemfiles 41b5c25
@carlosantoniodasilva carlosantoniodasilva Remove Ruby 1.9.2 from travis
I seriously hope no one is using this version in production.
aac5ab7
Commits on May 07, 2014
@carlosantoniodasilva carlosantoniodasilva Merge branch 'test-suite' 561278d
@JuanitoFatas JuanitoFatas Change README to markdown [ci skip]
Closes #217
c53d4ea
@carlosantoniodasilva carlosantoniodasilva Update gemspec with new README in markdown [ci skip] 0119795
@carlosantoniodasilva carlosantoniodasilva Remove dead code [ci skip] 0eae756
@carlosantoniodasilva carlosantoniodasilva Stop symlinking the Gemfile
Just have the file in the root as expected, and keep the others we need
under ci/.
279d94a
@carlosantoniodasilva carlosantoniodasilva Move all Gemfiles to "gemfiles" folder
This is a more commonly used name, according to the docs:
http://docs.travis-ci.com/user/languages/ruby/
5e8e50f
@carlosantoniodasilva carlosantoniodasilva Fix script that runs tests against all available Gemfiles
BUNDLE_GEMFILE needs the full path to work properly.

Load all custom Gemfiles rather than a fixed list, so adding/removing
files from the gemfiles/ folder just works.
5749667
@carlosantoniodasilva carlosantoniodasilva Fix example locale file for benchmark with newer yml 7a8489d
@carlosantoniodasilva carlosantoniodasilva Merge pull request #249 from arthurnn/available_locales_perf
Improve performance on enforce_available_locales!
bc3ca88
@carlosantoniodasilva carlosantoniodasilva Nodoc and document new internal method [ci skip]
Also improve docs on enforce available locale related methods.
3f30eb4
@carlosantoniodasilva carlosantoniodasilva Fix bundle check guard clause on run_all script
So that it does not need to run bundle install all the time.
192b0ff
Commits on May 08, 2014
@carlosantoniodasilva carlosantoniodasilva Remove missed lock file [ci skip] 8bb956a
@carlosantoniodasilva carlosantoniodasilva Remove Ruby 1.9.2 entries from travis exclude options [ci skip] a4f451b
@carlosantoniodasilva carlosantoniodasilva Get rid of test warning
    warning: (...) interpreted as grouped expression
f871057
Commits on May 09, 2014
@carlosantoniodasilva carlosantoniodasilva Use bundle exec when running tests for all gemfiles
Refactor script a bit, improve output.
38f7d53
@carlosantoniodasilva carlosantoniodasilva Create our own TestCase class to add methods
Rather than extending the base Test::Unit::TestCase, simply create our
own test case and add methods to it, and make sure we inherit from this
new test case everywhere.

Also make sure to call `super` on the teardown method.
706bcbf
Commits on May 28, 2014
@carlosantoniodasilva carlosantoniodasilva Test against latest Ruby 2.1 available in travis 8256226
@carlosantoniodasilva carlosantoniodasilva Update travis badge and link to the project on travis [ci skip] 080a79a
@arthurnn arthurnn Use svg travis badge [skip ci]
@carlosantoniodasilva as you are in here already..
54dae13
@carlosantoniodasilva carlosantoniodasilva Merge pull request #257 from arthurnn/patch-1
Use svg travis badge [skip ci]
66b7c05
@carlosantoniodasilva carlosantoniodasilva Fix Gemfile dependencies for Rails 4.1 and use Minitest if available
Fallback to test/unit in case minitest is not available, which should be
necessary for Ruby 1.8.7 only.
c6d95da
@carlosantoniodasilva carlosantoniodasilva Add bundler gem tasks for building/releasing 47f9a96
@carlosantoniodasilva carlosantoniodasilva Bump to 0.6.10 667bcfe
Commits on May 29, 2014
@arthurnn arthurnn Fix error when including Fallbacks on non-Simple backend
Commit 12aa0f0 introduced a bug, where
if `Fallbacks` module is included in a class that doesnt define
`translations` the code would fail. This is a pretty common
scenario, for instance when the backend is a `Chain`. Also this was
pretty common case to fail in rails, as its include Fallbacks in the
I18n.backend, like this:
```
I18n.backend.class.send(:include, I18n::Backend::Fallbacks)
```

This stops using the `translations` method in the fallbacks, and instead
ignores `I18n::InvalidLocale` errors.

[fixes #238]
[fixes #258]
[fixes #259]
f4d1d8f
Commits on May 31, 2014
@carlosantoniodasilva carlosantoniodasilva Merge pull request #260 from arthurnn/fix_fallback_ensure_locale
Fix error when including Fallbacks on non-Simple backend
1e983c0
Commits on Jun 29, 2014
@tenderlove tenderlove add minitest to Gemfile 3d9e547
@tenderlove tenderlove add test pattern to the Rakefile so all tests are run fb6c782
@tenderlove tenderlove fix test failure with seed 24594 45693e8
Commits on Jul 09, 2014
@carlosantoniodasilva carlosantoniodasilva Bump to 0.6.11 9eadb6b
@carlosantoniodasilva carlosantoniodasilva Merge pull request #263 from tenderlove/mt
add minitest to Gemfile
f320219
@carlosantoniodasilva carlosantoniodasilva Merge pull request #264 from tenderlove/rake
add test pattern to the Rakefile so all tests are run
d65607b
@carlosantoniodasilva carlosantoniodasilva Bump minitest 5e3e6a8
@carlosantoniodasilva carlosantoniodasilva Fix run_all script to use rake test 8c11065
@carlosantoniodasilva carlosantoniodasilva Ensure super is called from setup/teardown methods across the test suite
So that the base config/cleanup works as expected.
580da2e
@carlosantoniodasilva carlosantoniodasilva Merge pull request #265 from tenderlove/fix_test_24594
fix test failure with seed 24594

Conflicts:
	test/backend/fallbacks_test.rb
b102f18
@carlosantoniodasilva carlosantoniodasilva Tidy up chain + fallback setup logic in tests ad9affb
@carlosantoniodasilva carlosantoniodasilva Revert #default_separator on base test case
Clean teardown methods a bit by relying on the base test case.
b87f163
@carlosantoniodasilva carlosantoniodasilva Merge pull request #244 from semaperepelitsa/rescue_nil
locale= and default_locale now raise when setting a truthy value that
cannot be converted with #to_sym.

Conflicts:
	test/i18n_test.rb
217be44
@carlosantoniodasilva carlosantoniodasilva Fix pattern to only load files under our test directory de08cd7
@carlosantoniodasilva carlosantoniodasilva Require with full file path to mimic rake so that tests pass on Ruby …
…1.8.7

Since the require path is different simple_test file will be loaded
twice in Ruby 1.8.7, and the suite then fails with duplicated test names
being defined.

The solution for now is to require the file with full path, which mimics
how rake requires the files and thus only loads it once. This seems to
work with 1.8.7 and 1.9.3, but can be dropped as soon as 1.8.7 support
is removed.
267b15b
Commits on Jul 10, 2014
@carlosantoniodasilva carlosantoniodasilva Require missing set file. Closes #270 05428e5
Commits on Jul 13, 2014
@carlosantoniodasilva carlosantoniodasilva Fix typo in deprecation about :rescue_format. Closes #271 [ci skip] 0ebd3ac
Commits on Jul 16, 2014
@carlosantoniodasilva carlosantoniodasilva Officially drop support to Ruby 1.8/REE and Rails < 3.2 94b1705
@carlosantoniodasilva carlosantoniodasilva Remove string interpolation backport for Ruby 1.8
Now that 1.8 has been officially dropped, we can remove this extension.
353e244
@carlosantoniodasilva carlosantoniodasilva Remove more dead code related to Ruby version compatibility 6e3d1ba
@carlosantoniodasilva carlosantoniodasilva Remove deprecated :default_exception_handler method ccbc14e
@carlosantoniodasilva carlosantoniodasilva Remove deprecated normalize_translation_keys 1108de8
@carlosantoniodasilva carlosantoniodasilva Remove deprecated :rescue_format from exception handler 6db6403
@carlosantoniodasilva carlosantoniodasilva Refactor exception handler is_a? checks 1b83b16
@carlosantoniodasilva carlosantoniodasilva Remove the need for TokyoCabinet and Rufus dependency to run the tests
The key-value store requires a very specific API from the store, and we
can use a simple hash object to match that contract on our tests, so
there's no need for yet another dependency on top of it.
10c07ff
@carlosantoniodasilva carlosantoniodasilva Remove rufus and old AR support from benchmark script
Remove warning: `*' interpreted as argument prefix'`
5e1ce48
Commits on Jul 19, 2014
@carlosantoniodasilva carlosantoniodasilva Remove deprecation of enforce_available_locales and default it to true b5703d7
@carlosantoniodasilva carlosantoniodasilva Merge branch 'new-version' 075bb53
@carlosantoniodasilva carlosantoniodasilva Update version to 0.7 dev [ci skip] 45f51ff
@carlosantoniodasilva carlosantoniodasilva Update readme removing notes about Rails 2.3.x install [ci skip] 6357844
@carlosantoniodasilva carlosantoniodasilva Remove old "gem" hack for Rails 2.3 tests b20ac33
@carlosantoniodasilva carlosantoniodasilva Update bundles 8d3d250
@carlosantoniodasilva carlosantoniodasilva Remove Test::Unit setup cb679b8
Commits on Aug 17, 2014
@carlosantoniodasilva carlosantoniodasilva Fix assert order 015a99b
@carlosantoniodasilva carlosantoniodasilva Remove not used variable e3dd88f
@carlosantoniodasilva carlosantoniodasilva Ensure the cached locale list is cleared after reloading
So that the list gets properly updated when setting a new
locale/default_locale.

Related to #275.
b1200f0
@carlosantoniodasilva carlosantoniodasilva Add Gemfile pointing to rails master a715d7a
Commits on Aug 18, 2014
@carlosantoniodasilva carlosantoniodasilva Release 0.7.0.beta1 4612e6e
Commits on Aug 25, 2014
@Bartuz Bartuz Update lookup.rb
Just a small typo fix
8470b00
@carlosantoniodasilva carlosantoniodasilva Merge pull request #280 from Bartuz/patch-1
Typo fix
c686d44
Commits on Sep 26, 2014
@lmarlow lmarlow Teach Hash#slice to only include keys that exist in original
Previously this would blow up if you asked for a key that wasn't in the
original hash. This is consistent with Rails' version of Hash#slice.
24e71a9
Commits on Nov 12, 2014
@julik julik Perform deep merges when doing Backend::Chain#translate
Currently when requesting a namespace it would give you a union
of the top level keys, but would let nested keys override each other.

As an effect of this, you would be losing translations coming from
a lower-level backend if at least one subkey is "overridden" in a backend
that has higher priority.

This fix ensures that you instead get a "deep union" of all the translation
keys and the merges do indeed get performed correctly not only at the top
level of the namespace but all the way down.
d9e9113
@julik julik Demonstrate the issue with --seed=50992
Which is not related to my other branch in any way
6d12187
@julik julik Reset I18n.backend to make locale test order-independent
Previously it would fail tests when ran with a certain seed value,
due to I18n.backend containing too many useable translations.

For this test to run with certainty the backend should be re-initialized
to an empty one at the beginning.
981b95a
@julik julik Merge branch 'test-ordering-issue' into deep-merges-with-chain-lookup 8db944b
@yaroslav yaroslav Merge pull request #296 from julik/deep-merges-with-chain-lookup
Perform deep merges when doing Backend::Chain#translate
5bda22e
@julik julik Remove the method used for tracing the test ordering issue
was left in by mistake - was used to inspect the state of
I18n.config but not needed anymore once we found what
the problem was.
39c7a5a
@yaroslav yaroslav Merge pull request #297 from julik/deep-merges-with-chain-lookup
Remove the method used for tracing the test ordering issue
3992cfc
Commits on Dec 19, 2014
@carlosantoniodasilva carlosantoniodasilva Add Ruby 2.2 to travis but allow it to fail for now
There are two failures related to translating truthy / falsy values that
we need to take care of.
2b48cb3
@carlosantoniodasilva carlosantoniodasilva Bring back core ext string interpolate file referenced by Rails 3.2
We can't just drop the file because Rails 3.2 requires it directly, so
we keep it around even though it is just empty, since we won't support
Ruby 1.8 anymore.

This should allow Rails 3.2 users under Ruby 1.9 to update to the newest
I18n without problem.
a5690eb
@carlosantoniodasilva carlosantoniodasilva Add gemfile for testing with Rails 4.2 ddaafb7
@carlosantoniodasilva carlosantoniodasilva Bundle update 1ea83bc
@carlosantoniodasilva carlosantoniodasilva Add required ruby version to the gemspec 7269d5d
@carlosantoniodasilva carlosantoniodasilva Release 0.7.0 7a73dcc
Commits on Jan 03, 2015
@carlosantoniodasilva carlosantoniodasilva Bundle update ee7fef8
Commits on Jan 07, 2015
@davidcornu davidcornu Don't try to duplicate nil options 886de11
Commits on Jan 10, 2015
@carlosantoniodasilva carlosantoniodasilva Merge pull request #295 from davidcornu/nil-dup
Don't try to duplicate nil options
f2c9c66
@carlosantoniodasilva carlosantoniodasilva Merge pull request #289 from lmarlow/slice_non_existent_keys
Teach Hash#slice to only include keys that exist in original
9c8b240
@carlosantoniodasilva carlosantoniodasilva Tidy up 788a6c9
@carlosantoniodasilva carlosantoniodasilva Update changelog with #289 [ci skip] a69c73d
Commits on Feb 11, 2015
@carlosantoniodasilva carlosantoniodasilva :scissors: d4fb998
Commits on Mar 24, 2015
@carlosantoniodasilva carlosantoniodasilva Bundle update f19893d