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

Switch to ICU MessageFormat #2759

Merged
merged 18 commits into from
Apr 30, 2021
Merged

Switch to ICU MessageFormat #2759

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3fbaa01
Support MessageFormat files in backend, add automated testing for Loc…
askvortsov1 Apr 5, 2021
d8062e1
WIP: try out some message formatters
askvortsov1 Apr 5, 2021
8aa8f40
Apply fixes from StyleCI
askvortsov1 Apr 5, 2021
bb8a0a2
Enable intl for all translations by default
askvortsov1 Apr 12, 2021
9e058ca
Drop format-message, update icu-message-formatter
askvortsov1 Apr 12, 2021
fdd3290
Fix package-json
askvortsov1 Apr 12, 2021
5e08251
Fully rely on messageformat in frontend
askvortsov1 Apr 12, 2021
272e8a6
Fix failing test
askvortsov1 Apr 12, 2021
b263f55
Load core translations via locale manager
askvortsov1 Apr 12, 2021
1d9ab50
Drop curly braces from backend translator arg params
askvortsov1 Apr 12, 2021
e837986
Convert transChoice to trans, use MessageFormat
askvortsov1 Apr 12, 2021
9d5d950
Use rich library
askvortsov1 Apr 18, 2021
f54c288
Use mithril rich handler properly
askvortsov1 Apr 18, 2021
611121d
Restore package-lock to lockfile v2
askvortsov1 Apr 18, 2021
1765aa1
Merge branch 'master' into as/use-icu-messageformat
askvortsov1 Apr 30, 2021
c152b06
Apply fixes from StyleCI
askvortsov1 Apr 30, 2021
d6943bc
Revert unnecessary change
askvortsov1 Apr 30, 2021
b994258
Remove unnecessary null argument
askvortsov1 Apr 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into as/use-icu-messageformat
  • Loading branch information
@askvortsov1
askvortsov1 authored Apr 30, 2021
commit 1765aa16422d6509083780b4973dbd2d7f14940c
4 changes: 2 additions & 2 deletions src/Locale/LocaleServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ public function register()
$container->make('translator'),
$this->getCacheDir($container)
);

$locales->addLocale($this->getDefaultLocale(), 'Default');
$locales->addLocale($this->getDefaultLocale($container), 'Default');
$locales->addTranslations('en', __DIR__.'/../../locale/core.yml');
$locales->addTranslations('en', __DIR__.'/../../locale/validation.yml');

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.