Merge pull request #8300 from Bakual/NonPluralLanguageKeys

Fix language keys which trigger wrong plural detection in translation tools
joomla · Nov 9, 2015 · c315c5e · c315c5e
2 parents 1d3a872 + 882ea81
commit c315c5e
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 22 deletions.
diff --git a/administrator/components/com_banners/config.xml b/administrator/components/com_banners/config.xml
@@ -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

diff --git a/administrator/components/com_banners/models/forms/banner.xml b/administrator/components/com_banners/models/forms/banner.xml
@@ -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>
 

diff --git a/administrator/components/com_banners/models/forms/client.xml b/administrator/components/com_banners/models/forms/client.xml
@@ -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>
 

diff --git a/administrator/components/com_banners/models/forms/filter_clients.xml b/administrator/components/com_banners/models/forms/filter_clients.xml
@@ -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">

diff --git a/administrator/language/en-GB/en-GB.com_banners.ini b/administrator/language/en-GB/en-GB.com_banners.ini
@@ -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 --"

diff --git a/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini
@@ -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"

diff --git a/plugins/captcha/recaptcha/recaptcha.xml b/plugins/captcha/recaptcha/recaptcha.xml
@@ -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"