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

diff --git a/classes/Misc.php b/classes/Misc.php
index b53b590ca76d757f702ceb8284002f89cb18c9dd..308db30d027e2f02ef82f3befb6b145132853367 100644 (file)
--- 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 @@
                                                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
index 3bb242c2ace3f293f551c39d496183827b06d3c1..5625526e283d2f18bd8bde5dcaff43ca3210f23f 100755 (executable)
--- 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 @@
                }
 
                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
index 63ba3c0b1e2c6f26acfab2acf26d881fab65ad48..b50e399e5b671b63c7846438b3b8f2f2282de727 100755 (executable)
--- 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
index 16b77e8b0e8f2a46488f5811e940c3afbe8c75fd..84a259e924768051f4a7d704d0a194870988a00c 100644 (file)
--- 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
index 5ff2efc2d0da9b105468b6f1d9a57857f9f83ab5..747c6f7ba38a957e6413fbff4e28284154e5b23c 100644 (file)
--- 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 @@
                                'vars'  => array('report_id' => 'report_id'),
                        ),
                        'run' => array(
-                               'title' => $lang['strrun'],
+                               'title' => $lang['strexecute'],
                                'url'   => "sql.php?subject=report&{$misc->href}&return_url={$return_url}&return_desc=".urlencode($lang['strback'])."&",
                                'vars'  => array('report' => 'report_name', 'database' => 'db_name', 'query' => 'report_sql', 'paginate' => 'paginate'),
                        ),

diff --git a/sqledit.php b/sqledit.php
index bd3f3d6bf6be7b5a1b2c0f71c97264a2fe241b31..db916ffbe06c17d22c615cd9795b50a899e6fc05 100644 (file)
--- 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 @@
                        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
index 373fef9b447ef3f4076e27cbd466c398f2e84079..aa821e1e9c3d49b772ccce6e5dd1088c05563525 100644 (file)
--- a/tests/testcase/Server/ReportsTest.php
+++ b/tests/testcase/Server/ReportsTest.php
@@ -81,7 +81,7 @@ class ReportsTest extends PreconditionSet
 
         // 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']));