Skip to content

Commit 9d4cde7

Browse files
authored
Merge branch 'codeigniter4:develop' into develop
2 parents 52ad884 + 6edbaf6 commit 9d4cde7

File tree

165 files changed

+3048
-63
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+3048
-63
lines changed

.github/workflows/auto-review.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
steps:
3737
- name: Checkout code
38-
uses: actions/checkout@v4
38+
uses: actions/checkout@v6
3939

4040
- name: Setup PHP
4141
uses: shivammathur/setup-php@v2
@@ -50,7 +50,7 @@ jobs:
5050
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
5151

5252
- name: Cache composer dependencies
53-
uses: actions/cache@v4
53+
uses: actions/cache@v5
5454
with:
5555
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
5656
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
steps:
3636
- name: Checkout code
37-
uses: actions/checkout@v4
37+
uses: actions/checkout@v6
3838
with:
3939
fetch-depth: 2
4040

@@ -55,7 +55,7 @@ jobs:
5555
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
5656

5757
- name: Cache composer dependencies
58-
uses: actions/cache@v4
58+
uses: actions/cache@v5
5959
with:
6060
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
6161
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

.github/workflows/code-style.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
steps:
4040
- name: Checkout repository
41-
uses: actions/checkout@v4
41+
uses: actions/checkout@v6
4242

4343
- name: Setup PHP
4444
uses: shivammathur/setup-php@v2
@@ -53,7 +53,7 @@ jobs:
5353
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
5454

5555
- name: Cache composer dependencies
56-
uses: actions/cache@v4
56+
uses: actions/cache@v5
5757
with:
5858
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
5959
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

.github/workflows/generate-page.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
steps:
3232
- name: Checkout code
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@v6
3434

3535
- name: Setup PHP
3636
uses: shivammathur/setup-php@v2
@@ -46,7 +46,7 @@ jobs:
4646
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
4747

4848
- name: Cache composer dependencies
49-
uses: actions/cache@v4
49+
uses: actions/cache@v5
5050
with:
5151
path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
5252
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -63,7 +63,7 @@ jobs:
6363
run: ./bin/generate-page
6464

6565
- name: Upload artifact
66-
uses: actions/upload-pages-artifact@v3
66+
uses: actions/upload-pages-artifact@v4
6767
with:
6868
path: ./page/build
6969

.php-cs-fixer.dist.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
use CodeIgniter\CodingStandard\CodeIgniter4;
1313
use Nexus\CsConfig\Factory;
14-
use Nexus\CsConfig\Fixer\Comment\NoCodeSeparatorCommentFixer;
15-
use Nexus\CsConfig\FixerGenerator;
1614
use PhpCsFixer\Finder;
1715

1816
$finder = Finder::create()
@@ -31,12 +29,8 @@
3129
$overrides = [];
3230

3331
$options = [
34-
'finder' => $finder,
35-
'usingCache' => true,
36-
'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
37-
'customRules' => [
38-
NoCodeSeparatorCommentFixer::name() => true,
39-
],
32+
'finder' => $finder,
33+
'usingCache' => true,
4034
];
4135

4236
return Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary(

CHANGELOG.md

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,73 @@ All notable changes to this library will be documented in this file:
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [v4.6.4](https://github.com/codeigniter4/translations/compare/v4.6.3...v4.6.4) - 2025-12-12
9+
10+
### Changed
11+
12+
- fa (Farsi)
13+
- fr (French)
14+
- gu (Gujarati)
15+
- hi (Hindi)
16+
- id (Indonesian)
17+
- ko (Korean)
18+
- ru (Russian)
19+
- sv-SE (Swedish)
20+
- sw (Swahili)
21+
22+
### Others
23+
24+
- chore(deps): bump actions/checkout from 4 to 5 (#500)
25+
- chore(deps): bump actions/upload-pages-artifact from 3 to 4 (#501)
26+
- chore(deps): bump actions/cache from 4 to 5 (#514)
27+
- chore(deps): bump actions/checkout from 5 to 6 (#505)
28+
29+
## [v4.6.3](https://github.com/codeigniter4/translations/compare/v4.6.2...v4.6.3) - 2025-08-02
30+
31+
### Changed
32+
33+
- bn (Bengali)
34+
35+
## [v4.6.2](https://github.com/codeigniter4/translations/compare/v4.6.1...v4.6.2) - 2025-07-26
36+
37+
### Added
38+
39+
- gu (Gujarati)
40+
- hi (Hindi)
41+
42+
### Changed
43+
44+
- ko (Korean)
45+
- pl (Polish)
46+
- sv-SE (Swedish)
47+
48+
### Fixed
49+
50+
- fix: use `0` as percent when file is missing for `array_sum()` (#490)
51+
- fix translation testing (#492)
52+
- Fix data provider order
53+
54+
### Others
55+
56+
- Don't use branch alias for `codeigniter4/codeigniter4`
57+
- chore: use `system/util_bootstrap.php` for non-test scripts
58+
- chore: make `bin/generate-changelog` executable
59+
- Remove deprecated fixer
60+
61+
## [v4.6.1](https://github.com/codeigniter4/translations/compare/v4.6.0...v4.6.1) - 2025-05-02
62+
63+
### Changed
64+
65+
- ar (Arabic)
66+
- id (Indonesian)
67+
- pt-BR (Brazilian)
68+
69+
### Others
70+
71+
- chore: bump runner to ubuntu-24.04
72+
- chore: check code style using lowest and highest PHP version (#487)
73+
- chore: added PHP `8.4` to Github Action (#488)
74+
875
## [v4.6.0](https://github.com/codeigniter4/translations/compare/v4.5.4...v4.6.0) - 2025-02-21
976

1077
### Changed

Language/bn/CLI.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
'migration' => 'মাইগ্রেশন ক্লাসের নাম',
2828
'model' => 'মডেল ক্লাসের নাম',
2929
'seeder' => 'সিডার ক্লাসের নাম',
30+
'test' => 'পরীক্ষা ক্লাসের নাম',
3031
'validation' => 'বৈধতা ক্লাসের নাম',
3132
],
3233
'commandType' => 'কমান্ডের ধরন',

Language/bn/Core.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
'copyError' => 'ফাইলটি ({0}) প্রতিস্থাপন করার চেষ্টা করার সময় একটি ত্রুটির সম্মুখীন হয়েছে৷ অনুগ্রহ করে নিশ্চিত করুন যে আপনার ফাইল ডিরেক্টরি লেখার যোগ্য।',
1515
'enabledZlibOutputCompression' => 'আপনার zlib.output_compression ini নির্দেশিকা চালু আছে। এটি আউটপুট বাফারের সাথে ভাল কাজ করবে না।',
1616
'invalidFile' => 'অবৈধ ফাইল: {0}',
17+
'invalidDirectory' => 'ডিরেক্টরিটি বিদ্যমান নেই: {0}', // 'Directory does not exist: "{0}"'
1718
'invalidPhpVersion' => 'CodeIgniter চালানোর জন্য আপনার PHP ভার্সন অবশ্যই {0} বা উচ্চতর হতে হবে। বর্তমান সংস্করণ: {1}',
1819
'missingExtension' => 'ফ্রেমওয়ার্কের জন্য নিম্নলিখিত এক্সটেনশন(গুলি) ইনস্টল করা এবং লোড করা প্রয়োজন: {0}।',
1920
'noHandlers' => '{0} অবশ্যই অন্তত একজন হ্যান্ডলার প্রদান করবে।',

Language/bn/Errors.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
return [
1414
'pageNotFound' => '৪০৪ - পৃষ্ঠা পাওয়া যায়নি',
1515
'sorryCannotFind' => 'দুঃখিত! আপনি যে পৃষ্ঠাটি খুঁজছিলেন তা খুঁজে পাওয়া যায়নি বলে মনে হচ্ছে।',
16+
'badRequest' => '৪০০ - অবৈধ অনুরোধ',
17+
'sorryBadRequest' => 'দুঃখিত! আপনার অনুরোধে কোনো সমস্যা আছে।',
1618
'whoops' => 'উফফ!',
1719
'weHitASnag' => 'আমাদের মনে হয় কোনো সমস্যা হয়েছে। পরে আবার চেষ্টা করুন...',
1820
];

Language/bn/HTTP.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
// IncomingRequest
2121
'invalidNegotiationType' => '{0} একটি বৈধ আলোচনার ধরন নয়। এর মধ্যে একটি হতে হবে: মিডিয়া, অক্ষর সেট, এনকোডিং, ভাষা।',
22+
'invalidJSON' => 'JSON স্ট্রিং পার্স করতে ব্যর্থ হয়েছে। ত্রুটি: {0}', // 'Failed to parse JSON string. Error: {0}'
23+
'unsupportedJSONFormat' => 'প্রদত্ত JSON ফরমেট সমর্থিত নয়।', // 'The provided JSON format is not supported.'
2224

2325
// Message
2426
'invalidHTTPProtocol' => 'অবৈধ HTTP প্রোটোকল সংস্করণ। এর মধ্যে একটি হতে হবে: {0}',

0 commit comments

Comments
 (0)