From 129559d4850a245d46a114d58202823169b2c538 Mon Sep 17 00:00:00 2001 From: Bugo Date: Tue, 20 Feb 2024 14:49:29 +0500 Subject: [PATCH 1/3] Use SMF_VERSION in $txt['credits_intro'] Signed-off-by: Bugo --- Languages/en_US/Who.php | 2 +- Sources/Actions/Credits.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Languages/en_US/Who.php b/Languages/en_US/Who.php index 157e4c7187..46766488a9 100644 --- a/Languages/en_US/Who.php +++ b/Languages/en_US/Who.php @@ -174,7 +174,7 @@ // Credits text $txt['credits'] = 'Credits'; -$txt['credits_intro'] = 'Simple Machines wants to thank everyone who helped make SMF 2.1 what it is today; shaping and directing our project, all through the thick and the thin. It wouldn\'t have been possible without you. This includes our users and especially Charter Members - thanks for installing and using our software as well as providing valuable feedback, bug reports, and opinions.'; +$txt['credits_intro'] = 'Simple Machines wants to thank everyone who helped make SMF {SMF_VERSION} what it is today; shaping and directing our project, all through the thick and the thin. It wouldn\'t have been possible without you. This includes our users and especially Charter Members - thanks for installing and using our software as well as providing valuable feedback, bug reports, and opinions.'; $txt['credits_team'] = 'The Team'; $txt['credits_special'] = 'Special Thanks'; $txt['credits_list'] = '{names}.'; diff --git a/Sources/Actions/Credits.php b/Sources/Actions/Credits.php index 9599634c39..7c7f45b6ab 100644 --- a/Sources/Actions/Credits.php +++ b/Sources/Actions/Credits.php @@ -76,7 +76,7 @@ public function execute(): void Utils::$context['credits'] = [ [ - 'pretext' => Lang::$txt['credits_intro'], + 'pretext' => Lang::getTxt('credits_intro', ['SMF_VERSION' => SMF_VERSION]), 'title' => Lang::$txt['credits_team'], 'groups' => [ [ From b9e77cd7e8ac09cd1c4340fd91e9cc99d1881f1a Mon Sep 17 00:00:00 2001 From: Bugo Date: Tue, 20 Feb 2024 15:00:34 +0500 Subject: [PATCH 2/3] Use pluralization in $txt['package_bytes'] Signed-off-by: Bugo --- Languages/en_US/Packages.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Languages/en_US/Packages.php b/Languages/en_US/Packages.php index 35cccc4c08..d090c1bd19 100644 --- a/Languages/en_US/Packages.php +++ b/Languages/en_US/Packages.php @@ -140,7 +140,10 @@ // Don't use entities in the below string. $txt['package_theme_failure_warning'] = 'At least one error was encountered during a test install of this theme. Are you sure you wish to attempt installation?'; -$txt['package_bytes'] = '({size, number, integer} bytes)'; +$txt['package_bytes'] = '({size, plural, + one {# byte} + other {# bytes} +})'; $txt['package_action_missing'] = 'File not found'; $txt['package_action_error'] = 'Modification parse error'; From 4c6212539d7c0cb0adf73a0aeffbaa5d6e773954 Mon Sep 17 00:00:00 2001 From: Bugo Date: Tue, 20 Feb 2024 15:05:14 +0500 Subject: [PATCH 3/3] Fix wrong keywords in txt['profile_error_signature_max_length'] and $txt['profile_error_signature_max_lines'] Signed-off-by: Bugo --- Languages/en_US/Profile.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Languages/en_US/Profile.php b/Languages/en_US/Profile.php index d0e4e92f71..67001516aa 100644 --- a/Languages/en_US/Profile.php +++ b/Languages/en_US/Profile.php @@ -440,11 +440,11 @@ $txt['profile_error_signature_max_length'] = '{0, plural, one {Your signature cannot be longer than # character} - one {Your signature cannot be longer than # characters} + other {Your signature cannot be longer than # characters} }'; $txt['profile_error_signature_max_lines'] = '{0, plural, one {Your signature cannot span more than # line} - one {Your signature cannot span more than # lines} + other {Your signature cannot span more than # lines} }'; $txt['profile_error_signature_max_image_size'] = '{0, plural, one {Images in your signature must be no larger than # pixel {1, plural,