@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Standardize on locale file not saying `%n$s` unless necessary
Summary:
The goal of this is https://phabricator.wikimedia.org/T413532 - making the upstream locale file match with itself modified by translatewiki's scripts. This helps catch a lot of errors, and it's neater too.
Also fix an outright erroneous case where the wrong string was being substituted.
Test Plan: Read the locale file.
Reviewers: O1 Blessed Committers, aklapper
Reviewed By: O1 Blessed Committers, aklapper
Subscribers: aklapper, tobiaswiese, valerio.bozzolan, Matthew, Cigaryno
Differential Revision: https://we.phorge.it/D26623
+5
-5
+5
-5
src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
+5
-5
src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
···
1728
1728
array(
1729
1729
array(
1730
1730
'%s moved %s on a board: %4$s.',
1731
-
'%s moved %s on %s boards: %4$s.',
1731
+
'%s moved %s on %s boards: %s.',
1732
1732
),
1733
1733
),
1734
1734
),
···
1811
1811
'You may be able to retry later. (%s)' =>
1812
1812
array(
1813
1813
'Failed to acquire write lock after waiting %s second. '.
1814
-
'You may be able to retry later. (%2$s)',
1814
+
'You may be able to retry later. (%s)',
1815
1815
'Failed to acquire write lock after waiting %s seconds. '.
1816
1816
'You may be able to retry later. (%s)',
1817
1817
),
···
1908
1908
'%d merchant(s) it has a relationship with: %s.' =>
1909
1909
array(
1910
1910
'You can view this account because you control '.
1911
-
'a merchant it has a relationship with: %s.',
1911
+
'a merchant it has a relationship with: %2$s.',
1912
1912
'You can view this account because you control '.
1913
1913
'%d merchants it has a relationship with: %s.',
1914
1914
),
···
2023
2023
),
2024
2024
'Failed to write %d byte(s) to file "%s".' =>
2025
2025
array(
2026
-
'Failed to write %d byte to file "%2$s".',
2026
+
'Failed to write %d byte to file "%s".',
2027
2027
'Failed to write %d bytes to file "%s".',
2028
2028
),
2029
2029
'Failed to write %d byte(s) to "%s".' =>
2030
2030
array(
2031
-
'Failed to write %d byte to "%2$s".',
2031
+
'Failed to write %d byte to "%s".',
2032
2032
'Failed to write %d bytes to "%s".',
2033
2033
),
2034
2034
'This lock was most recently acquired by '.