[Fmsystem-commits] [7583] API: Improve translation upgrade

[Sigurd Nes]

Revision: 7583
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7583
Author:   sigurdne
Date:     2011-09-13 13:45:08 +0000 (Tue, 13 Sep 2011)
Log Message:
-----------
API: Improve translation upgrade

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.translation.inc.php
    trunk/setup/lang.php
    trunk/setup/templates/base/lang_main.tpl

Modified: trunk/phpgwapi/inc/class.translation.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.translation.inc.php        2011-09-13 11:56:55 UTC 
(rev 7582)
+++ trunk/phpgwapi/inc/class.translation.inc.php        2011-09-13 13:45:08 UTC 
(rev 7583)
@@ -347,8 +347,7 @@
 
                                if ($upgrademethod == 'dumpold')
                                {
-                                       // dont delete the custom main- & 
loginscreen messages every time
-                                       $GLOBALS['phpgw']->db->query("DELETE 
FROM phpgw_lang where app_name != 'mainscreen' AND app_name != 
'loginscreen'",__LINE__,__FILE__);
+                                       $GLOBALS['phpgw']->db->query('DELETE 
FROM phpgw_lang',__LINE__,__FILE__);
                                        
$GLOBALS['phpgw_info']['server']['lang_ctimes'] = array();
                                }
 
@@ -372,7 +371,7 @@
 
                                                if 
($GLOBALS['phpgw']->db->f('cnt') != 0)
                                                {
-                                                       $error .= "Lang code 
'{$lang}' already installed: skipping<br>\n";
+                                                       echo "<div 
class=\"error\">Lang code '{$lang}' already installed: skipping</div>\n";
                                                        continue;
                                                }
                                        }

Modified: trunk/setup/lang.php
===================================================================
--- trunk/setup/lang.php        2011-09-13 11:56:55 UTC (rev 7582)
+++ trunk/setup/lang.php        2011-09-13 13:45:08 UTC (rev 7583)
@@ -153,12 +153,14 @@
                                                        . 'FROM phpgw_languages 
'
                                                        . 'WHERE lang_id 
IN('.implode(',', $avail_lang).') ORDER BY lang_name');
 
-                       $select_box_langs = '';
+                       $checkbox_langs = '';
                        while ($GLOBALS['phpgw_setup']->db->next_record())
                        {
                                $id = $GLOBALS['phpgw_setup']->db->f('lang_id');
-                               $selected = 
isset($GLOBALS['phpgw_info']['setup']['installed_langs'][$id]) ? ' selected' : 
'';
-                               $select_box_langs .= "<option 
value=\"$id\"{$selected}>" . $GLOBALS['phpgw_setup']->db->f('lang_name') . 
"</option>\n";
+                               $name = 
$GLOBALS['phpgw_setup']->db->f('lang_name');
+                               $checked = 
isset($GLOBALS['phpgw_info']['setup']['installed_langs'][$id]) ? ' checked = 
"checked"' : '';
+
+                               $checkbox_langs .="<label><input 
type=\"checkbox\" name=\"lang_selected[]\" 
value=\"$id\"$checked>{$name}</label><br>";
                        }
 
                        $GLOBALS['phpgw_setup']->db->query("UPDATE 
phpgw_languages SET available = 'Yes' WHERE lang_id IN('" . implode("','", 
$avail_lang) . "'"); 
@@ -188,7 +190,7 @@
                        $setup_tpl->set_var('td_align',$td_align);
                        $setup_tpl->set_var('hidden_var1',$hidden_var1);
                        $setup_tpl->set_var('select_box_desc',$select_box_desc);
-                       
$setup_tpl->set_var('select_box_langs',$select_box_langs);
+                       $setup_tpl->set_var('checkbox_langs',$checkbox_langs);
 
                        $setup_tpl->set_var('lang_install',lang('install'));
                        $setup_tpl->set_var('lang_cancel',lang('cancel'));

Modified: trunk/setup/templates/base/lang_main.tpl
===================================================================
--- trunk/setup/templates/base/lang_main.tpl    2011-09-13 11:56:55 UTC (rev 
7582)
+++ trunk/setup/templates/base/lang_main.tpl    2011-09-13 13:45:08 UTC (rev 
7583)
@@ -15,9 +15,9 @@
                {select_box_desc}
                <form method="POST" action="lang.php">
                {hidden_var1}
-               <select name="lang_selected[]" multiple size="10">
-               {select_box_langs}
-               </select>
+               <p style="height: 150px; overflow: auto; border: 5px solid 
#eee; background: #eee; color: #000; margin-bottom: 1.5em;">
+               {checkbox_langs}
+               </p>
        </td>
        <!-- BEGIN B_choose_method -->
        <td valign="top">