Merge pull request #17929 from craftcms/feature/translations

[6.x] Translations

Author: brandonkelly

.codecov.yml

@@ -29,7 +29,6 @@ ignore:
   - 'src/icons'
   - 'src/migrations'
   - 'src/test/internal'
-  - 'src/translations'
   - 'src/views'
   - 'src/web/assets'
   - 'tests'

.gitattributes

@@ -38,22 +38,22 @@
 /yii2-adapter export-ignore
 
 # Identify generated files
-/src/translations/a*/app.php linguist-generated=true
-/src/translations/c*/app.php linguist-generated=true
-/src/translations/d*/app.php linguist-generated=true
-/src/translations/en-GB/app.php linguist-generated=true
-/src/translations/es/app.php linguist-generated=true
-/src/translations/f*/app.php linguist-generated=true
-/src/translations/h*/app.php linguist-generated=true
-/src/translations/i*/app.php linguist-generated=true
-/src/translations/j*/app.php linguist-generated=true
-/src/translations/k*/app.php linguist-generated=true
-/src/translations/n*/app.php linguist-generated=true
-/src/translations/p*/app.php linguist-generated=true
-/src/translations/r*/app.php linguist-generated=true
-/src/translations/s*/app.php linguist-generated=true
-/src/translations/t*/app.php linguist-generated=true
-/src/translations/z*/app.php linguist-generated=true
+/resources/translations/a*/app.php linguist-generated=true
+/resources/translations/c*/app.php linguist-generated=true
+/resources/translations/d*/app.php linguist-generated=true
+/resources/translations/en-GB/app.php linguist-generated=true
+/resources/translations/es/app.php linguist-generated=true
+/resources/translations/f*/app.php linguist-generated=true
+/resources/translations/h*/app.php linguist-generated=true
+/resources/translations/i*/app.php linguist-generated=true
+/resources/translations/j*/app.php linguist-generated=true
+/resources/translations/k*/app.php linguist-generated=true
+/resources/translations/n*/app.php linguist-generated=true
+/resources/translations/p*/app.php linguist-generated=true
+/resources/translations/r*/app.php linguist-generated=true
+/resources/translations/s*/app.php linguist-generated=true
+/resources/translations/t*/app.php linguist-generated=true
+/resources/translations/z*/app.php linguist-generated=true
 /src/web/assets/**/dist/**/*.css linguist-generated=true
 /src/web/assets/**/dist/**/*.css.map linguist-generated=true
 /src/web/assets/**/dist/**/*.min.js linguist-generated=true

.github/workflows/facades.yml

@@ -58,6 +58,7 @@ jobs:
             CraftCms\\Cms\\Support\\Facades\\Announcements \
             CraftCms\\Cms\\Support\\Facades\\Deprecator \
             CraftCms\\Cms\\Support\\Facades\\Fields \
+            CraftCms\\Cms\\Support\\Facades\\Lang \
             CraftCms\\Cms\\Support\\Facades\\ProjectConfig \
             CraftCms\\Cms\\Support\\Facades\\Updates
 

CHANGELOG-WIP.md

@@ -264,3 +264,14 @@ Moved the following controllers:
 - Deprecated `craft\services\SystemMessages`. `CraftCms\Cms\SystemMessage\SystemMessages` should be used instead.
 - Deprecated `craft\models\SystemMessage` and `craft\records\SystemMessage`. `CraftCms\Cms\SystemMessage\Models\SystemMessage` should be used instead.
 - Replaced `craft\controllers\SystemMessagesController` with `CraftCms\Cms\Http\Controllers\Utilities\SystemMessagesController`
+
+## Translations
+
+- Deprecated `craft\i18n\FormatConverter`. `CraftCms\Cms\Translation\FormatConverter` should be used instead.
+- Deprecated `craft\i18n\Formatter`. `CraftCms\Cms\Translation\Formatter` should be used instead.
+- Deprecated `craft\i18n\I18N`. `CraftCms\Cms\Translation\I18N` should be used instead.
+- Deprecated `craft\i18n\Locale`. `CraftCms\Cms\Translation\Locale` should be used instead.
+- Deprecated `craft\i18n\MessageFormatter`.
+- Deprecated `craft\i18n\PhpMessageSource`.
+- Deprecated `craft\i18n\Translation`. `CraftCms\Cms\Support\Facades\I18N` should be used instead.
+- Deprecated `Craft::t`. `CraftCms\Cms\t` should be used instead.

CONTRIBUTING.md

@@ -61,7 +61,7 @@ Once the VuePress dev server is up and running, you’ll be able to view the doc
 
 We manage Craft’s Control Panel translations with [Crowdin](https://crowdin.com/project/craft-cms).
 
-If you want to help improve Craft’s translations, [sign up to be a translator](https://crwd.in/craft-cms), or you can submit a pull request directly to the [src/translations/](https://github.com/craftcms/cms/tree/develop/src/translations) folder if you prefer. 
+If you want to help improve Craft’s translations, [sign up to be a translator](https://crwd.in/craft-cms), or you can submit a pull request directly to the [resources/translations/](https://github.com/craftcms/cms/tree/develop/resources/translations) folder if you prefer. 
 
 ## Core Enhancements
 

composer.json

@@ -66,7 +66,9 @@
     "twig/twig": "~3.21.1",
     "web-auth/webauthn-lib": "~4.9.0",
     "webonyx/graphql-php": "~14.11.10",
-    "yiisoft/html": "^3.11"
+    "yiisoft/html": "^3.11",
+    "yiisoft/translator": "^3.2",
+    "yiisoft/translator-message-php": "^1.1"
   },
   "require-dev": {
     "dg/bypass-finals": "^1.9",