Start i18n of multiactions. Use 'Execute' instead of 'Run'.

TheEevoS · Apr 24, 2007 · 27d3a8f · 27d3a8f
1 parent 80a3d60
commit 27d3a8f
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/classes/Misc.php b/classes/Misc.php
@@ -2,7 +2,7 @@
 	/**
 	 * Class to hold various commonly used functions
 	 *
-	 * $Id: Misc.php,v 1.146 2007/04/24 15:00:02 soranzo Exp $
+	 * $Id: Misc.php,v 1.147 2007/04/24 15:31:29 soranzo Exp $
 	 */
 
 	class Misc {
@@ -1686,7 +1686,7 @@ function printTable(&$tabledata, &$columns, &$actions, $nodata = null, $pre_fn =
 						foreach($multiactions['actions'] as $o)
 							echo "\t\t<option value=\"{$o['action']}\">{$o['title']}</option>\n";
 					echo "\t</select>\n";
-					echo "<input type=\"submit\" value=\"submit\" />\n";
+					echo "<input type=\"submit\" value=\"{$lang['strexecute']}\" />\n";
 					echo $misc->form;
 					echo "</td>\n";
 					echo "</tr>\n";

diff --git a/database.php b/database.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage schemas within a database
 	 *
-	 * $Id: database.php,v 1.95 2007/04/23 18:48:06 soranzo Exp $
+	 * $Id: database.php,v 1.96 2007/04/24 15:31:29 soranzo Exp $
 	 */
 
 	// Include application functions
@@ -871,7 +871,7 @@ function doSQL() {
 		}
 
 		echo "<p><input type=\"checkbox\" id=\"paginate\" name=\"paginate\"", (isset($_REQUEST['paginate']) ? ' checked="checked"' : ''), " /><label for=\"paginate\">{$lang['strpaginate']}</label></p>\n";
-		echo "<p><input type=\"submit\" value=\"{$lang['strrun']}\" />\n";
+		echo "<p><input type=\"submit\" value=\"{$lang['strexecute']}\" />\n";
 		if ($data->hasFullExplain()) {
 			echo "<input type=\"submit\" name=\"explain\" value=\"{$lang['strexplain']}\" />\n";
 			echo "<input type=\"submit\" name=\"explain_analyze\" value=\"{$lang['strexplainanalyze']}\" />\n";

diff --git a/lang/english.php b/lang/english.php
@@ -4,7 +4,7 @@
 	 * English language file for phpPgAdmin.  Use this as a basis
 	 * for new translations.
 	 *
-	 * $Id: english.php,v 1.207 2007/04/24 15:00:03 soranzo Exp $
+	 * $Id: english.php,v 1.208 2007/04/24 15:31:29 soranzo Exp $
 	 */
 
 	// Language and character set
@@ -100,7 +100,7 @@
 	$lang['strclusterindex'] = 'Cluster';
 	$lang['strclustered'] = 'Clustered?';
 	$lang['strreindex'] = 'Reindex';
-	$lang['strrun'] = 'Run';
+	$lang['strexecute'] = 'Execute';
 	$lang['stradd'] = 'Add';
 	$lang['strevent'] = 'Event';
 	$lang['strwhere'] = 'Where';

diff --git a/lang/recoded/english.php b/lang/recoded/english.php
@@ -4,7 +4,7 @@
 	 * English language file for phpPgAdmin.  Use this as a basis
 	 * for new translations.
 	 *
-	 * $Id: english.php,v 1.159 2007/04/24 15:00:03 soranzo Exp $
+	 * $Id: english.php,v 1.160 2007/04/24 15:31:29 soranzo Exp $
 	 */
 
 	// Language and character set
@@ -100,7 +100,7 @@
 	$lang['strclusterindex'] = 'Cluster';
 	$lang['strclustered'] = 'Clustered?';
 	$lang['strreindex'] = 'Reindex';
-	$lang['strrun'] = 'Run';
+	$lang['strexecute'] = 'Execute';
 	$lang['stradd'] = 'Add';
 	$lang['strevent'] = 'Event';
 	$lang['strwhere'] = 'Where';

diff --git a/reports.php b/reports.php
@@ -3,7 +3,7 @@
 	/**
 	 * List reports in a database
 	 *
-	 * $Id: reports.php,v 1.26 2007/04/22 00:41:58 mr-russ Exp $
+	 * $Id: reports.php,v 1.27 2007/04/24 15:31:29 soranzo Exp $
 	 */
 
 	// Include application functions
@@ -278,7 +278,7 @@ function doDefault($msg = '') {
 				'vars'  => array('report_id' => 'report_id'),
 			),
 			'run' => array(
-				'title' => $lang['strrun'],
+				'title' => $lang['strexecute'],
 				'url'   => "sql.php?subject=report&amp;{$misc->href}&amp;return_url={$return_url}&amp;return_desc=".urlencode($lang['strback'])."&amp;",
 				'vars'  => array('report' => 'report_name', 'database' => 'db_name', 'query' => 'report_sql', 'paginate' => 'paginate'),
 			),

diff --git a/sqledit.php b/sqledit.php
@@ -3,7 +3,7 @@
 	/**
 	 * Alternative SQL editing window
 	 *
-	 * $Id: sqledit.php,v 1.32 2007/04/22 00:41:58 mr-russ Exp $
+	 * $Id: sqledit.php,v 1.33 2007/04/24 15:31:29 soranzo Exp $
 	 */
 
 	// Include application functions
@@ -169,7 +169,7 @@ function doDefault() {
 			htmlspecialchars($_REQUEST['query']), "</textarea>\n";
 		echo "<label for=\"paginate\"><input type=\"checkbox\" id=\"paginate\" name=\"paginate\"", (isset($_REQUEST['paginate']) ? ' checked="checked"' : ''), " />&nbsp;{$lang['strpaginate']}</label>\n";
 
-		echo "<p><input type=\"submit\" value=\"{$lang['strrun']}\" />\n";
+		echo "<p><input type=\"submit\" value=\"{$lang['strexecute']}\" />\n";
 		if ($data->hasFullExplain()) {
 			echo "<input type=\"submit\" name=\"explain\" value=\"{$lang['strexplain']}\" />\n";
 			echo "<input type=\"submit\" name=\"explain_analyze\" value=\"{$lang['strexplainanalyze']}\" />\n";

diff --git a/tests/testcase/Server/ReportsTest.php b/tests/testcase/Server/ReportsTest.php
@@ -81,7 +81,7 @@ function testRun()
 
         // Run the existing report and verify it.
         $this->assertTrue($this->get($webUrl . '/reports.php'));
-        $this->assertTrue($this->clickLink($lang['strrun']));
+        $this->assertTrue($this->clickLink($lang['strexecute']));
         $this->assertWantedText($lang['strnodata']);
 
         $this->assertTrue($this->clickLink($lang['strrefresh']));