Skip to content

Commit c315c5e

Browse files
rdeutzrdeutz
committed
Merge pull request #8300 from Bakual/NonPluralLanguageKeys
Fix language keys which trigger wrong plural detection in translation tools
2 parents 1d3a872 + 882ea81 commit c315c5e

File tree

7 files changed

+31
-22
lines changed

7 files changed

+31
-22
lines changed

‎administrator/components/com_banners/config.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
default="0"
1313
>
1414
<option
15-
value="1">COM_BANNERS_FIELD_VALUE_1</option>
15+
value="1">COM_BANNERS_FIELD_VALUE_UNLIMITED</option>
1616
<option
17-
value="2">COM_BANNERS_FIELD_VALUE_2</option>
17+
value="2">COM_BANNERS_FIELD_VALUE_YEARLY</option>
1818
<option
19-
value="3">COM_BANNERS_FIELD_VALUE_3</option>
19+
value="3">COM_BANNERS_FIELD_VALUE_MONTHLY</option>
2020
<option
21-
value="4">COM_BANNERS_FIELD_VALUE_4</option>
21+
value="4">COM_BANNERS_FIELD_VALUE_WEEKLY</option>
2222
<option
23-
value="5">COM_BANNERS_FIELD_VALUE_5</option>
23+
value="5">COM_BANNERS_FIELD_VALUE_DAILY</option>
2424
</field>
2525

2626
<field

‎administrator/components/com_banners/models/forms/banner.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,15 +141,15 @@
141141
default="0">
142142
<option value="-1">COM_BANNERS_FIELD_VALUE_USECLIENTDEFAULT
143143
</option>
144-
<option value="1">COM_BANNERS_FIELD_VALUE_1
144+
<option value="1">COM_BANNERS_FIELD_VALUE_UNLIMITED
145145
</option>
146-
<option value="2">COM_BANNERS_FIELD_VALUE_2
146+
<option value="2">COM_BANNERS_FIELD_VALUE_YEARLY
147147
</option>
148-
<option value="3">COM_BANNERS_FIELD_VALUE_3
148+
<option value="3">COM_BANNERS_FIELD_VALUE_MONTHLY
149149
</option>
150-
<option value="4">COM_BANNERS_FIELD_VALUE_4
150+
<option value="4">COM_BANNERS_FIELD_VALUE_WEEKLY
151151
</option>
152-
<option value="5">COM_BANNERS_FIELD_VALUE_5
152+
<option value="5">COM_BANNERS_FIELD_VALUE_DAILY
153153
</option>
154154
</field>
155155

‎administrator/components/com_banners/models/forms/client.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@
4747
>
4848
<option value="-1">JGLOBAL_USE_GLOBAL
4949
</option>
50-
<option value="1">COM_BANNERS_FIELD_VALUE_1
50+
<option value="1">COM_BANNERS_FIELD_VALUE_UNLIMITED
5151
</option>
52-
<option value="2">COM_BANNERS_FIELD_VALUE_2
52+
<option value="2">COM_BANNERS_FIELD_VALUE_YEARLY
5353
</option>
54-
<option value="3">COM_BANNERS_FIELD_VALUE_3
54+
<option value="3">COM_BANNERS_FIELD_VALUE_MONTHLY
5555
</option>
56-
<option value="4">COM_BANNERS_FIELD_VALUE_4
56+
<option value="4">COM_BANNERS_FIELD_VALUE_WEEKLY
5757
</option>
58-
<option value="5">COM_BANNERS_FIELD_VALUE_5
58+
<option value="5">COM_BANNERS_FIELD_VALUE_DAILY
5959
</option>
6060
</field>
6161

‎administrator/components/com_banners/models/forms/filter_clients.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
onchange="this.form.submit();"
2626
>
2727
<option value="">COM_BANNERS_SELECT_TYPE</option>
28-
<option value="1">COM_BANNERS_FIELD_VALUE_1</option>
29-
<option value="2">COM_BANNERS_FIELD_VALUE_2</option>
30-
<option value="3">COM_BANNERS_FIELD_VALUE_3</option>
31-
<option value="4">COM_BANNERS_FIELD_VALUE_4</option>
32-
<option value="5">COM_BANNERS_FIELD_VALUE_5</option>
28+
<option value="1">COM_BANNERS_FIELD_VALUE_UNLIMITED</option>
29+
<option value="2">COM_BANNERS_FIELD_VALUE_YEARLY</option>
30+
<option value="3">COM_BANNERS_FIELD_VALUE_MONTHLY</option>
31+
<option value="4">COM_BANNERS_FIELD_VALUE_WEEKLY</option>
32+
<option value="5">COM_BANNERS_FIELD_VALUE_DAILY</option>
3333
</field>
3434
</fields>
3535
<fields name="list">

‎administrator/language/en-GB/en-GB.com_banners.ini‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,17 @@ COM_BANNERS_FIELD_TRACKIMPRESSION_DESC="Record the impressions (views) of the ba
126126
COM_BANNERS_FIELD_TRACKIMPRESSION_LABEL="Track Impressions"
127127
COM_BANNERS_FIELD_TYPE_DESC="Choose the type of banner. Select Image to display an image from /images/banners/ folder. Select Custom to enter your custom code."
128128
COM_BANNERS_FIELD_TYPE_LABEL="Type"
129+
; The following five strings are deprecated and will be removed with 4.0. They generate wrong plural detection in Crowdin.
129130
COM_BANNERS_FIELD_VALUE_1="Unlimited"
130131
COM_BANNERS_FIELD_VALUE_2="Yearly"
131132
COM_BANNERS_FIELD_VALUE_3="Monthly"
132133
COM_BANNERS_FIELD_VALUE_4="Weekly"
133134
COM_BANNERS_FIELD_VALUE_5="Daily"
135+
COM_BANNERS_FIELD_VALUE_UNLIMITED="Unlimited"
136+
COM_BANNERS_FIELD_VALUE_YEARLY="Yearly"
137+
COM_BANNERS_FIELD_VALUE_MONTHLY="Monthly"
138+
COM_BANNERS_FIELD_VALUE_WEEKLY="Weekly"
139+
COM_BANNERS_FIELD_VALUE_DAILY="Daily"
134140
COM_BANNERS_FIELD_VALUE_CUSTOM="Custom"
135141
COM_BANNERS_FIELD_VALUE_IMAGE="Image"
136142
COM_BANNERS_FIELD_VALUE_USECLIENTDEFAULT="-- Use Client Default --"

‎administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ PLG_CAPTCHA_RECAPTCHA="CAPTCHA - reCAPTCHA"
1010
PLG_RECAPTCHA_VERSION_1_WARNING_LABEL="You have selected Version 1.0. All new sites should be using Version 2.0. Version 1.0 is only maintained to provide support for Global Site keys which are no longer available from Google."
1111
PLG_RECAPTCHA_VERSION_LABEL="Version"
1212
PLG_RECAPTCHA_VERSION_DESC="Version 2.0 is the recommended version. Version 1.0 is required if using deprecated Global reCAPTCHA keys."
13+
; The following two strings are deprecated and will be removed with 4.0. They generate wrong plural detection in Crowdin.
1314
PLG_RECAPTCHA_VERSION_1="1.0"
1415
PLG_RECAPTCHA_VERSION_2="2.0"
16+
PLG_RECAPTCHA_VERSION_V1="1.0"
17+
PLG_RECAPTCHA_VERSION_V2="2.0"
1518
PLG_RECAPTCHA_PUBLIC_KEY_LABEL="Site key"
1619
PLG_RECAPTCHA_PUBLIC_KEY_DESC="Used in the JavaScript code that is served to your users. See the plugin description for instructions on getting a site key."
1720
PLG_RECAPTCHA_PRIVATE_KEY_LABEL="Secret key"

‎plugins/captcha/recaptcha/recaptcha.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
label="PLG_RECAPTCHA_VERSION_LABEL"
2929
description="PLG_RECAPTCHA_VERSION_DESC"
3030
size="1">
31-
<option value="1.0">PLG_RECAPTCHA_VERSION_1</option>
32-
<option value="2.0">PLG_RECAPTCHA_VERSION_2</option>
31+
<option value="1.0">PLG_RECAPTCHA_VERSION_V1</option>
32+
<option value="2.0">PLG_RECAPTCHA_VERSION_V2</option>
3333
</field>
3434
<field
3535
name="public_key"

0 commit comments

Comments
 (0)