Merge pull request joomla#20 from zero-24/patch-2

Fixes language strings as well as adds all files to the install.xml
mwatt · Nov 6, 2015 · 22d165d · 22d165d
2 parents 8b61d2b + 89e94e0
commit 22d165d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -333,6 +333,7 @@ protected function updateManifestCaches()
 			array('plugin', 'yubikey', 'twofactorauth', 0),
 			array('plugin', 'updatenotification', 'system', 0),
 			array('plugin', 'module', 'editors-xtd', 0),
+			array('plugin', 'stats', 'system', 0),
 
 			// Templates
 			array('template', 'beez3', '', 0),

diff --git a/administrator/language/en-GB/en-GB.plg_system_stats.ini b/administrator/language/en-GB/en-GB.plg_system_stats.ini
@@ -4,9 +4,9 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_SYSTEM_STATS="System - Joomla! Statistics"
-PLG_STATS_XML_DESCRIPTION="System Plugin that sends environment statistics to a server controlled by the Joomla! project for statistical analysis. Statistics sent include PHP version, CMS version, Database type and Database version."
-PLG_STATS_UNIQUE_ID_DESC="An identifier that allows us to count unique installs of the plugin. This is sent with the statistics back to the server."
-PLG_STATS_UNIQUE_ID_LABEL="Unique ID"
-PLG_STATS_URL_DESC="The official Joomla server url"
-PLG_STATS_URL_LABEL="Url"
-PLG_STATS_RESET_UNIQUE_ID="Reset Unique Id"
+PLG_SYSTEM_STATS_UNIQUE_ID_DESC="An identifier that allows the Joomla! project to count unique installs of the plugin. This is sent with the statistics back to the server."
+PLG_SYSTEM_STATS_UNIQUE_ID_LABEL="Unique ID"
+PLG_SYSTEM_STATS_URL_DESC="The official Joomla server url"
+PLG_SYSTEM_STATS_URL_LABEL="Url"
+PLG_SYSTEM_STATS_RESET_UNIQUE_ID="Reset Unique Id"
+PLG_SYSTEM_STATS_XML_DESCRIPTION="System Plugin that sends environment statistics to a server controlled by the Joomla! project for statistical analysis. Statistics sent include PHP version, CMS version, Database type and Database version."
diff --git a/administrator/language/en-GB/en-GB.plg_system_stats.sys.ini b/administrator/language/en-GB/en-GB.plg_system_stats.sys.ini
@@ -4,6 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_SYSTEM_STATS="System - Joomla! Statistics"
-PLG_STATS_XML_DESCRIPTION="System Plugin that sends environment statistics to a server controlled by the Joomla! project for statistical analysis. Statistics sent include PHP version, CMS version, Database type and Database version."
-PLG_STATS_UNIQUE_ID_DESC="An identifier that allows us to count unique installs of the plugin. This is sent with the statistics back to the server."
-PLG_STATS_UNIQUE_ID_LABEL="Unique ID"
+PLG_SYSTEM_STATS_XML_DESCRIPTION="System Plugin that sends environment statistics to a server controlled by the Joomla! project for statistical analysis. Statistics sent include PHP version, CMS version, Database type and Database version."
diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
@@ -201,6 +201,8 @@
 		<filename>en-GB.plg_system_remember.sys.ini</filename>
 		<filename>en-GB.plg_system_sef.ini</filename>
 		<filename>en-GB.plg_system_sef.sys.ini</filename>
+		<filename>en-GB.plg_system_stats.ini</filename>
+		<filename>en-GB.plg_system_stats.sys.ini</filename>
 		<filename>en-GB.plg_system_updatenotification.ini</filename>
 		<filename>en-GB.plg_system_updatenotification.sys.ini</filename>
 		<filename>en-GB.plg_twofactorauth_totp.ini</filename>

diff --git a/plugins/system/stats/fields/uniqueid.php b/plugins/system/stats/fields/uniqueid.php
@@ -37,6 +37,6 @@ protected function getInput()
 
 		return '<input type="hidden" name="' . $this->name . '" id="' . $this->id . '" value="'
 			. htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '" /> <a class="btn" ' . $onclick . '>'
-			. '<span class="icon-refresh"></span> ' . JText::_('PLG_STATS_RESET_UNIQUE_ID') . '</a>';
+			. '<span class="icon-refresh"></span> ' . JText::_('PLG_SYSTEM_STATS_RESET_UNIQUE_ID') . '</a>';
 	}
 }
diff --git a/plugins/system/stats/stats.xml b/plugins/system/stats/stats.xml
@@ -8,7 +8,7 @@
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.5.0</version>
-	<description>PLG_STATS_XML_DESCRIPTION</description>
+	<description>PLG_SYSTEM_STATS_XML_DESCRIPTION</description>
 	<files>
 		<filename plugin="stats">stats.php</filename>
 		<folder>fields</folder>
@@ -23,8 +23,8 @@
 				<field
 					name="unique_id"
 					type="stats.uniqueid"
-					description="PLG_STATS_UNIQUE_ID_DESC"
-					label="PLG_STATS_UNIQUE_ID_LABEL"
+					description="PLG_SYSTEM_STATS_UNIQUE_ID_DESC"
+					label="PLG_SYSTEM_STATS_UNIQUE_ID_LABEL"
 					size="10"
 				/>
 				<field
@@ -33,8 +33,8 @@
 					filter="url"
 					size="30"
 					default="https://developer.joomla.org/stats/submit"
-					description="PLG_STATS_URL_DESC"
-					label="PLG_STATS_URL_LABEL"					
+					description="PLG_SYSTEM_STATS_URL_DESC"
+					label="PLG_SYSTEM_STATS_URL_LABEL"					
 				/>
 				<field
 					name="lastrun"