Skip to content

Fix language keys which trigger wrong plural detection in translation tools #8300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 9, 2015
Merged

Fix language keys which trigger wrong plural detection in translation tools #8300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions administrator/components/com_banners/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
default="0"
>
<option
value="1">COM_BANNERS_FIELD_VALUE_1</option>
value="1">COM_BANNERS_FIELD_VALUE_UNLIMITED</option>
<option
value="2">COM_BANNERS_FIELD_VALUE_2</option>
value="2">COM_BANNERS_FIELD_VALUE_YEARLY</option>
<option
value="3">COM_BANNERS_FIELD_VALUE_3</option>
value="3">COM_BANNERS_FIELD_VALUE_MONTHLY</option>
<option
value="4">COM_BANNERS_FIELD_VALUE_4</option>
value="4">COM_BANNERS_FIELD_VALUE_WEEKLY</option>
<option
value="5">COM_BANNERS_FIELD_VALUE_5</option>
value="5">COM_BANNERS_FIELD_VALUE_DAILY</option>
</field>

<field
Expand Down
10 changes: 5 additions & 5 deletions administrator/components/com_banners/models/forms/banner.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,15 @@
default="0">
<option value="-1">COM_BANNERS_FIELD_VALUE_USECLIENTDEFAULT
</option>
<option value="1">COM_BANNERS_FIELD_VALUE_1
<option value="1">COM_BANNERS_FIELD_VALUE_UNLIMITED
</option>
<option value="2">COM_BANNERS_FIELD_VALUE_2
<option value="2">COM_BANNERS_FIELD_VALUE_YEARLY
</option>
<option value="3">COM_BANNERS_FIELD_VALUE_3
<option value="3">COM_BANNERS_FIELD_VALUE_MONTHLY
</option>
<option value="4">COM_BANNERS_FIELD_VALUE_4
<option value="4">COM_BANNERS_FIELD_VALUE_WEEKLY
</option>
<option value="5">COM_BANNERS_FIELD_VALUE_5
<option value="5">COM_BANNERS_FIELD_VALUE_DAILY
</option>
</field>

Expand Down
10 changes: 5 additions & 5 deletions administrator/components/com_banners/models/forms/client.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@
>
<option value="-1">JGLOBAL_USE_GLOBAL
</option>
<option value="1">COM_BANNERS_FIELD_VALUE_1
<option value="1">COM_BANNERS_FIELD_VALUE_UNLIMITED
</option>
<option value="2">COM_BANNERS_FIELD_VALUE_2
<option value="2">COM_BANNERS_FIELD_VALUE_YEARLY
</option>
<option value="3">COM_BANNERS_FIELD_VALUE_3
<option value="3">COM_BANNERS_FIELD_VALUE_MONTHLY
</option>
<option value="4">COM_BANNERS_FIELD_VALUE_4
<option value="4">COM_BANNERS_FIELD_VALUE_WEEKLY
</option>
<option value="5">COM_BANNERS_FIELD_VALUE_5
<option value="5">COM_BANNERS_FIELD_VALUE_DAILY
</option>
</field>

Expand Down
10 changes: 5 additions & 5 deletions administrator/components/com_banners/models/forms/filter_clients.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
onchange="this.form.submit();"
>
<option value="">COM_BANNERS_SELECT_TYPE</option>
<option value="1">COM_BANNERS_FIELD_VALUE_1</option>
<option value="2">COM_BANNERS_FIELD_VALUE_2</option>
<option value="3">COM_BANNERS_FIELD_VALUE_3</option>
<option value="4">COM_BANNERS_FIELD_VALUE_4</option>
<option value="5">COM_BANNERS_FIELD_VALUE_5</option>
<option value="1">COM_BANNERS_FIELD_VALUE_UNLIMITED</option>
<option value="2">COM_BANNERS_FIELD_VALUE_YEARLY</option>
<option value="3">COM_BANNERS_FIELD_VALUE_MONTHLY</option>
<option value="4">COM_BANNERS_FIELD_VALUE_WEEKLY</option>
<option value="5">COM_BANNERS_FIELD_VALUE_DAILY</option>
</field>
</fields>
<fields name="list">
Expand Down
6 changes: 6 additions & 0 deletions administrator/language/en-GB/en-GB.com_banners.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,17 @@ COM_BANNERS_FIELD_TRACKIMPRESSION_DESC="Record the impressions (views) of the ba
COM_BANNERS_FIELD_TRACKIMPRESSION_LABEL="Track Impressions"
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."
COM_BANNERS_FIELD_TYPE_LABEL="Type"
; The following five strings are deprecated and will be removed with 4.0. They generate wrong plural detection in Crowdin.
COM_BANNERS_FIELD_VALUE_1="Unlimited"
COM_BANNERS_FIELD_VALUE_2="Yearly"
COM_BANNERS_FIELD_VALUE_3="Monthly"
COM_BANNERS_FIELD_VALUE_4="Weekly"
COM_BANNERS_FIELD_VALUE_5="Daily"
COM_BANNERS_FIELD_VALUE_UNLIMITED="Unlimited"
COM_BANNERS_FIELD_VALUE_YEARLY="Yearly"
COM_BANNERS_FIELD_VALUE_MONTHLY="Monthly"
COM_BANNERS_FIELD_VALUE_WEEKLY="Weekly"
COM_BANNERS_FIELD_VALUE_DAILY="Daily"
COM_BANNERS_FIELD_VALUE_CUSTOM="Custom"
COM_BANNERS_FIELD_VALUE_IMAGE="Image"
COM_BANNERS_FIELD_VALUE_USECLIENTDEFAULT="-- Use Client Default --"
Expand Down
3 changes: 3 additions & 0 deletions administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@ PLG_CAPTCHA_RECAPTCHA="CAPTCHA - reCAPTCHA"
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."
PLG_RECAPTCHA_VERSION_LABEL="Version"
PLG_RECAPTCHA_VERSION_DESC="Version 2.0 is the recommended version. Version 1.0 is required if using deprecated Global reCAPTCHA keys."
; The following two strings are deprecated and will be removed with 4.0. They generate wrong plural detection in Crowdin.
PLG_RECAPTCHA_VERSION_1="1.0"
PLG_RECAPTCHA_VERSION_2="2.0"
PLG_RECAPTCHA_VERSION_V1="1.0"
PLG_RECAPTCHA_VERSION_V2="2.0"
PLG_RECAPTCHA_PUBLIC_KEY_LABEL="Site key"
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."
PLG_RECAPTCHA_PRIVATE_KEY_LABEL="Secret key"
Expand Down
4 changes: 2 additions & 2 deletions plugins/captcha/recaptcha/recaptcha.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
label="PLG_RECAPTCHA_VERSION_LABEL"
description="PLG_RECAPTCHA_VERSION_DESC"
size="1">
<option value="1.0">PLG_RECAPTCHA_VERSION_1</option>
<option value="2.0">PLG_RECAPTCHA_VERSION_2</option>
<option value="1.0">PLG_RECAPTCHA_VERSION_V1</option>
<option value="2.0">PLG_RECAPTCHA_VERSION_V2</option>
</field>
<field
name="public_key"
Expand Down