various fixes for correct catalan/spanish display

6 files changed, 7 insertions, 7 deletions

diff --git a/program/include/main.inc b/program/include/main.inc
index 8cad7778a..b4b2aa9e8 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -856,7 +856,7 @@ function rcube_table_output($attrib, $sql_result, $a_show_cols, $id_col)
   $table .= "<thead><tr>\n";
 
   foreach ($a_show_cols as $col)
-    $table .= '<td class="'.$col.'">' . rcube_label($col) . "</td>\n";
+    $table .= '<td class="'.$col.'">' . rep_specialchars_output(rcube_label($col)) . "</td>\n";
 
   $table .= "</tr></thead>\n<tbody>\n";
   
diff --git a/program/localization/ca/labels.inc b/program/localization/ca/labels.inc
index 533cd318d..f6b287769 100644
--- a/program/localization/ca/labels.inc
+++ b/program/localization/ca/labels.inc
@@ -64,6 +64,7 @@ $labels['filesize'] = 'Mida del fitxer';
 
 $labels['preferhtml'] = 'Prefereix HTML';
 $labels['htmlmessage'] = 'Missatge HTML';
+$labels['prettydate'] = 'Dates curtes';
 
 $labels['addtoaddressbook'] = 'Afegir a la llibreta d\'adreces';
 
diff --git a/program/localization/es/labels.inc b/program/localization/es/labels.inc
index 0f627ebb7..bd800361e 100644
--- a/program/localization/es/labels.inc
+++ b/program/localization/es/labels.inc
@@ -63,7 +63,7 @@ $labels['filesize'] = 'Tamaņo del fichero';
 
 $labels['preferhtml'] = 'Prefiero HTML';
 $labels['htmlmessage'] = 'Mensaje HTML';
-//$labels['prettydate'] = '';
+$labels['prettydate'] = 'Fechas cortas';
 
 $labels['addtoaddressbook'] = 'Aņadir a contactos';
 
diff --git a/program/localization/index.inc b/program/localization/index.inc
index 94b07b999..6f68b0c46 100644
--- a/program/localization/index.inc
+++ b/program/localization/index.inc
@@ -25,11 +25,10 @@
 	'en_GB' => 'English (GB)',
 	'ar'    => 'Arabic',
 	'bg'    => 'Bulgarian',
-	'cat'   => 'Catalan',
 	'tw'    => 'Chinese (BIG5)',
 	'cn'    => 'Chinese(GB2312)',
 	'cz'    => 'Czech',
- 	'ca'    => 'Catalan',
+ 	'ca'    => 'Catal&agrave;',
 	'da'    => 'Dansk',
  	'de'    => 'Deutsch',
  	'es'    => 'Espa&ntilde;ol',
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 01b02bbdd..c0b303a62 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -251,7 +251,7 @@ function rcmail_message_list($attrib)
   $out .= "<thead><tr>\n<td class=\"icon\">&nbsp;</td>\n";
  
   foreach ($a_show_cols as $col)
-    $out .= '<td class="'.$col.'">' . rcube_label($col) . "</td>\n";
+    $out .= '<td class="'.$col.'">' . rep_specialchars_output(rcube_label($col)) . "</td>\n";
 
   $out .= '<td class="icon">'.($attrib['attachmenticon'] ? sprintf($image_tag, $skin_path, $attrib['attachmenticon'], '') : '')."</td>\n";
   $out .= "</tr></thead>\n<tbody>\n";
@@ -813,7 +813,7 @@ function rcmail_message_headers($attrib, $headers=NULL)
       $header_value = rep_specialchars_output($IMAP->decode_header($headers[$hkey]), '', 'all');
 
     $out .= "\n<tr>\n";
-    $out .= '<td class="header-title">'.rcube_label($hkey).":&nbsp;</td>\n";
+    $out .= '<td class="header-title">'.rep_specialchars_output(rcube_label($hkey)).":&nbsp;</td>\n";
     $out .= '<td class="'.$hkey.'" width="90%">'.$header_value."</td>\n</tr>";
     $header_count++;
     }
diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc
index f9cbc7c96..e0f649cdc 100644
--- a/program/steps/settings/edit_identity.inc
+++ b/program/steps/settings/edit_identity.inc
@@ -88,7 +88,7 @@ function rcube_identity_form($attrib)
 
     $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
                     $attrib['id'],
-                    rcube_label($label),
+                    rep_specialchars_output(rcube_label($label)),
                     $value);
     }