Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge upstream/master Changes Into Integration #4

Open
wants to merge 93 commits into
base: integration
Choose a base branch
from
Open

Merge upstream/master Changes Into Integration #4

wants to merge 93 commits into from
+923 −292

Conversation

aaronskiba
Copy link
Collaborator

  • Our integration branch is quite behind upstream/master. This PR is meant to bring integration up-to-date with upstream/master.

@MichaelHoste
Fix translation#41 ArgumentError: comparison of Pathname with String …
ed70149 
…failed
@MichaelHoste
Bump version to 1.23 + Changelog
afce75b
@MichaelHoste
Chapter on frontend localization
5064a40
@MichaelHoste
Improve README (frontend localization)
1c61530
@MichaelHoste
Try "dist: focal" and jruby-head to fix error between jruby and lowes…
cf82e9f 
…t.gemfile
@MichaelHoste
Use bionic to try to be compatible with Ruby < 2.4 (openssl issue)
5bfb87d
@MichaelHoste
Remove 2.1 (not compatible in Travis on Bionic), add "ruby --version"…
2e40507 
… to debug more easily (what version is jruby-head !?)
@MichaelHoste
Remove failing test on travis with JRuby (but works in dev)
cbd4e10
@MichaelHoste
Fix "custom language" alphanumeric => alphabetic
35ad1b3
@MichaelHoste
Remove special code that added missing locales
0ab5789 
was corrected on Translation.io-side with correct Lower/Upper Sorbian codes: https://translation.io/docs/languages
@MichaelHoste
Better warnings for wrong locales in config file + specs, bump Rspec,…
972734c 
… Force version of GetText to avoid dependency to external online request: ruby-gettext/gettext#85 (comment)
@MichaelHoste
Trigger travis build after migration
994f01c
@MichaelHoste
Bump rspec lowest dependency
8eb2e3f
@MichaelHoste
Fix lowest rspec dependency
490d193
@MichaelHoste
Update travis-ci.org to travis-ci.com build image
0ea3294
@MichaelHoste
Bump version to 1.24 + changelog
a59ed68
@MichaelHoste
Fix issue with empty values in localization.xx.yml files that were re…
6e54034 
…moved when `config.yaml_remove_empty_keys = true` + Bump version to 1.25
@MichaelHoste
use double splat operator (**) to pass hash as keyword argument (for …
215f87b 
…Ruby 3.0)
@MichaelHoste
bump version to 1.26
c3cdfb2
@MichaelHoste
missing word changelog
f6ddb7f
@MichaelHoste
Small update README
ea68764
@MichaelHoste
Newlines in README
a449a7e
@MichaelHoste
Better pointers for frontend localization
5346f1e
@MichaelHoste
Small improvements
eff4e77
@MichaelHoste
Small improvement
ce74575
@MichaelHoste
wording
028ab93
@MichaelHoste
fix links
3595ec0
@MichaelHoste
Fix bad anchor
c4c9eeb
@MichaelHoste
Improve symbol/string consistency of source_locale and `target_loca…
db4f6ef 
…les`
@MichaelHoste
Bump version to 1.27
d0a48d2
MichaelHoste and others added 26 commits November 16, 2022 14:35
@MichaelHoste
Fix plural rule in source PO file by manually adding it (for GetText …
57808a0 
…>= 3.3.9) (translation#53)

* Manually manage plural rules for source PO file

Manually manage plural rules for source PO file when GetText >= 3.3.9 and the introduction of optional `red-datasets` dependency for plural rules
@MichaelHoste
Bump version 1.33 + changelog
78e59d3
@MichaelHoste
Fix links in changelog
1de0f52
@MichaelHoste
Add Ruby 3.2 to testing matrix + Update test.yml to really test "3.0"…
d9272e4 
… and not 3 that is transformed to "3.2"
@MichaelHoste
Fix File.exists? to File.exist (compatibility with Ruby 3.2)
ff737a0
@MichaelHoste
Changelog + Bump version to 1.35
ca482f7
@MichaelHoste
Update README with direct "translation.io/rails" link
79a96b3
@MichaelHoste
Update Lingui URL
96c8974
@MichaelHoste
Fix translation.io/usage to translation.io/rails/usage and many r…
5b5d477 
…emaining `http://` to `https://`
@MichaelHoste
Init cleanup: keep YAML files and keys from locales that are not in t…
c8e576f 
…he configuration file. (translation#54)

* Don't delete unmanaged locales YAML files when init new project
* Add spec to check that cleanup don't remove ignored target languages
@MichaelHoste
Bump to version 1.36
aa03abd
@MichaelHoste
Remove old Ruby 2.2 from CI (CI triggers an error unrelated to our code)
45d57a5
@didier-84
Update README.md
608d3b4 
Replace relative link by absolute link
@MichaelHoste
Improve README (remove $ in bash commands to allow copy-paste)
91351e7
@MichaelHoste
Bump GetText dependency ("3.4.4 added racc to runtime dependencies be…
9b76837 
…cause Ruby 3.3 doesn't include racc/parser")
@MichaelHoste
Add Ruby 3.3.0-preview1 in Github Actions
67f7909
@MichaelHoste
Remove 3.3.0-preview1 from test pipeline with lowest dependencies
f932a9e
@MichaelHoste
Changelog + bump version to 1.37
3136a1a
@MichaelHoste
Update gemspec links
7f02656
@MichaelHoste
Bump GetText dependencies to max 3.4.9
3b3e088
@MichaelHoste
Bump version to 1.38 and CHANGELOG
c12d760
@MichaelHoste
Fix bug when YAML is commented and only the language key is present
31faa13
@MichaelHoste
Bump to 1.39
5b33dcd
@MichaelHoste
Better bugfix for empty YAML files (only the language prefix)
832762e
@MichaelHoste
Bump to version 1.40
35c0c4a
@aaronskiba
Merge remote-tracking branch 'upstream/master' into integration-copy
d329dd8
@aaronskiba
Copy link
Collaborator Author

To fully test this PR, the following update must be made in the Gemfile of portagenetwork/roadmap:

gem 'translation', git: 'https://github.com/ualbertalib/translation_io_rails',
                   branch: 'aaron/merge-upstream-master'

@aaronskiba
Copy link
Collaborator Author

To fully test this PR, the following update must be made in the Gemfile of portagenetwork/roadmap:

gem 'translation', git: 'https://github.com/ualbertalib/translation_io_rails',
                   branch: 'aaron/merge-upstream-master'

I've gone ahead and done this. The branch aaron/translation_io_rails/upgrade-testing is published within the portagenetwork/roadmap repo and can be used to test this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@200455939-yashu 200455939-yashu Awaiting requested review from 200455939-yashu

@lagoan lagoan Awaiting requested review from lagoan

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@aaronskiba @MichaelHoste @didier-84