Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/craftcms/cms into 5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonkelly committed Feb 5, 2024
2 parents bae149c + 8332c9d commit df97a0c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
- Fixed a JavaScript error that could occur when previewing an image.
- Fixed a bug where new entries would keep propagating all content across all sites for newly-created elements, even after switching to a different site.
- 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))

## 5.0.0-alpha.11 - 2024-02-01

Expand Down
1 change: 0 additions & 1 deletion src/i18n/PhpMessageSource.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
}
Expand Down

0 comments on commit df97a0c

Please sign in to comment.