Merge branch 'develop' into 4.8

craftcms · Feb 5, 2024 · db48c0d · db48c0d
2 parents f52cbee + 8332c9d
commit db48c0d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Fixed a bug where “Move to the left” and “Move to the right” actions within field layout designers weren’t always getting enabled when they should, if a new tab was added.
 - Fixed a bug where “Move to the left” and “Move to the right” actions within field layout designers were labelled incorrectly for right-to-left languages.
 - Fixed a bug where users with “Create entries” permission but not “Delete entries” weren’t allowed to delete their own unpublished drafts. ([#14294](https://github.com/craftcms/cms/issues/14294))
+- Fixed a bug where Yii-provided Chinese translations weren’t getting picked up in the control panel. ([#14287](https://github.com/craftcms/cms/issues/14287))
 
 ## 4.7.1 - 2024-01-29
 

diff --git a/src/i18n/PhpMessageSource.php b/src/i18n/PhpMessageSource.php
@@ -50,7 +50,6 @@ protected function getMessageFilePath($category, $language): string
                 'de-CH' => 'de',
                 'fr-CA' => 'fr',
                 'nb', 'nn' => 'nb-NO',
-                'zh' => 'zh-CN',
                 default => $language,
             };
         }