From 8c7dcb660ae2ec93e1bf40e64c8d28243bc65522 Mon Sep 17 00:00:00 2001
From: robocoder <anthon.pang@gmail.com>
Date: Mon, 12 Jul 2010 22:44:59 +0000
Subject: [PATCH] upcase words in installation steps; use "JavaScript"
consistently
git-svn-id: http://dev.piwik.org/svn/trunk@2485 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
lang/en.php | 16 ++++++++--------
.../testcases/level0/test.piwik.index.xml | 10 +++++-----
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/lang/en.php b/lang/en.php
index 10a129fec7..283a25d473 100644
--- a/lang/en.php
+++ b/lang/en.php
@@ -412,7 +412,7 @@ $translations = array(
'Goals_WhenVisitors' => 'when visitors',
'Goals_WhereThe' => 'where the',
'Goals_Manually' => 'manually',
- 'Goals_ManuallyTriggeredUsingJavascriptFunction' => 'Goal is manually triggered using the Javascript API trackGoal()',
+ 'Goals_ManuallyTriggeredUsingJavascriptFunction' => 'Goal is manually triggered using the JavaScript API trackGoal()',
'Goals_VisitUrl' => 'Visit a given URL (page or group of pages)',
'Goals_URL' => 'URL',
'Goals_Filename' => 'filename',
@@ -441,7 +441,7 @@ $translations = array(
'Installation_InstallationStatus' => 'Installation status',
'Installation_PercentDone' => '%s %% Done',
'Installation_NoConfigFound' => 'The Piwik configuration file couldn\'t be found and you are trying to access a Piwik page.<br /><b> » You can <a href=\'index.php\'>install Piwik now</a></b><br /><small>If you installed Piwik before and have some tables in your DB, don\'t worry, you can reuse the same tables and keep your existing data!</small>',
- 'Installation_DatabaseSetup' => 'Database setup',
+ 'Installation_DatabaseSetup' => 'Database Setup',
'Installation_DatabaseSetupServer' => 'database server',
'Installation_DatabaseSetupLogin' => 'login',
'Installation_DatabaseSetupPassword' => 'password',
@@ -449,18 +449,18 @@ $translations = array(
'Installation_DatabaseSetupTablePrefix' => 'table prefix',
'Installation_DatabaseSetupAdapter' => 'adapter',
'Installation_DatabaseErrorConnect' => 'Error while trying to connect to the database server',
- 'Installation_DatabaseCheck' => 'Database check',
+ 'Installation_DatabaseCheck' => 'Database Check',
'Installation_DatabaseServerVersion' => 'Database server version',
'Installation_DatabaseClientVersion' => 'Database client version',
'Installation_DatabaseCreation' => 'Database creation',
'Installation_PleaseFixTheFollowingErrors' => 'Please fix the following errors',
'Installation_LargePiwikInstances' => 'Help for large Piwik instances',
- 'Installation_JsTag' => 'Javascript Tag',
+ 'Installation_JsTag' => 'JavaScript Tag',
'Installation_JsTagArchivingHelp' => 'For medium and high traffic websites, check out the <a target="_blank" href="http://piwik.org/docs/setup-auto-archiving/">How to setup auto archiving page</a> to make Piwik run really fast!',
'Installation_Congratulations' => 'Congratulations',
'Installation_CongratulationsHelp' => '<p>Congratulations! Your Piwik installation is complete.</p><p>Make sure your JavaScript code is entered on your pages, and wait for your first visitors!</p>',
'Installation_ContinueToPiwik' => 'Continue to Piwik',
- 'Installation_SetupWebsite' => 'Setup a website',
+ 'Installation_SetupWebsite' => 'Setup a Website',
'Installation_SetupWebSiteName' => 'website name',
'Installation_SetupWebSiteURL' => 'website URL',
'Installation_Timezone' => 'website time zone',
@@ -480,7 +480,7 @@ $translations = array(
'Installation_Optional' => 'Optional',
'Installation_Legend' => 'Legend',
'Installation_Extension' => 'extension',
- 'Installation_SystemCheck' => 'System check',
+ 'Installation_SystemCheck' => 'System Check',
'Installation_SystemCheckPhp' => 'PHP version',
'Installation_SystemCheckExtensions' => 'Other required extensions',
'Installation_SystemCheckDatabaseHelp' => 'Piwik requires either the mysqli extension or both the PDO and pdo_mysql extensions.',
@@ -521,7 +521,7 @@ $translations = array(
'Installation_SystemCheckProtocolHelp' => 'If you are behind a reverse proxy, add these lines to config/config.ini.php under the [General] section:',
'Installation_SystemCheckIpv4' => 'IPv4',
'Installation_SystemCheckIpv4Help' => 'You should disable IPv6 in your web server configuration.',
- 'Installation_Tables' => 'Creating the tables',
+ 'Installation_Tables' => 'Creating the Tables',
'Installation_TablesWithSameNamesFound' => 'Some %1$s tables in your database %2$s have the same names as the tables Piwik is trying to create',
'Installation_TablesFound' => 'The following tables have been found in the database',
'Installation_TablesWarningHelp' => 'Either choose to reuse the existing database tables or select a clean install to erase all existing data in the database.',
@@ -614,7 +614,7 @@ $translations = array(
'SecurityInfo_SecurityInformation' => 'PHP Security Information',
'SecurityInfo_Test' => 'Test',
'SecurityInfo_Result' => 'Result',
- 'SitesManager_PluginDescription' => 'Websites Management in Piwik: Add a new Website, Edit an existing one, Show the Javascript code to include on your pages. All the actions are also available through the API.',
+ 'SitesManager_PluginDescription' => 'Websites Management in Piwik: Add a new Website, Edit an existing one, Show the JavaScript code to include on your pages. All the actions are also available through the API.',
'SitesManager_Sites' => 'Websites',
'SitesManager_TrackingTags' => 'Tracking tags for %s',
'SitesManager_WebsitesManagement' => 'Websites Management',
diff --git a/tests/webtest/testcases/level0/test.piwik.index.xml b/tests/webtest/testcases/level0/test.piwik.index.xml
index e2b3e4e8ec..207d6ce11d 100644
--- a/tests/webtest/testcases/level0/test.piwik.index.xml
+++ b/tests/webtest/testcases/level0/test.piwik.index.xml
@@ -50,7 +50,7 @@
<verifyTitle description="check the title is parsed correctly" text="Piwik › Installation" />
<verifyText description="check page text" text="Piwik" />
- <verifyText description="check page text" text="System check" />
+ <verifyText description="check page text" text="System Check" />
<verifyText description="check page text" text="Optional" />
&checkForErrors;
@@ -68,7 +68,7 @@
<verifyTitle description="check the title is parsed correctly" text="Piwik › Installation" />
<verifyText description="check page text" text="Piwik" />
- <verifyText description="check page text" text="Database setup" />
+ <verifyText description="check page text" text="Database Setup" />
&checkForErrors;
&verifyLinksAndImages;
@@ -85,7 +85,7 @@
<!--
<verifyTitle description="check the title is parsed correctly" text="Piwik › Installation" />
<verifyText description="check page text" text="Piwik" />
- <verifyText description="check page text" text="Database check" />
+ <verifyText description="check page text" text="Database Check" />
&checkForErrors;
&verifyLinksAndImages;
@@ -141,7 +141,7 @@
<verifyTitle description="check the title is parsed correctly" text="Piwik › Installation" />
<verifyText description="check page text" text="Piwik" />
- <verifyText description="check page text" text="Setup a website" />
+ <verifyText description="check page text" text="Setup a Website" />
&checkForErrors;
&verifyLinksAndImages;
@@ -164,7 +164,7 @@
<verifyTitle description="check the title is parsed correctly" text="Piwik › Installation" />
<verifyText description="check page text" text="Piwik" />
- <verifyText description="check page text" text="JavaScript tag" />
+ <verifyText description="check page text" text="JavaScript Tag" />
&checkForErrors;
&verifyLinksAndImages;
--
GitLab