#1484980: fixed problem with month abbreviations localization (problem with May and maybe others)

5 files changed, 49 insertions, 48 deletions

diff --git a/program/include/main.inc b/program/include/main.inc
index 5c25f7fad..5b82640f7 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -1557,7 +1557,7 @@ function format_date($date, $format=NULL)
       $out .= rcube_label(strtolower(date('M', $timestamp)));
     // month name (long)
     else if ($format{$i}=='F')
-      $out .= rcube_label(strtolower(date('F', $timestamp)));
+      $out .= rcube_label('long'.strtolower(date('M', $timestamp)));
     else
       $out .= date($format{$i}, $timestamp);
     }
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index 829b06ee4..041e3b0a7 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -80,18 +80,18 @@ $labels['sep'] = 'Sep';
 $labels['oct'] = 'Oct';
 $labels['nov'] = 'Nov';
 $labels['dec'] = 'Dec';
-$labels['january'] = 'January';
-$labels['february'] = 'February';
-$labels['march'] = 'March';
-$labels['april'] = 'April';
-$labels['may'] = 'May';
-$labels['june'] = 'June';
-$labels['july'] = 'July';
-$labels['august'] = 'August';
-$labels['september'] = 'September';
-$labels['october'] = 'October';
-$labels['november'] = 'November';
-$labels['december'] = 'December';
+$labels['longjan'] = 'January';
+$labels['longfeb'] = 'February';
+$labels['longmar'] = 'March';
+$labels['longapr'] = 'April';
+$labels['longmay'] = 'May';
+$labels['longjun'] = 'June';
+$labels['longjul'] = 'July';
+$labels['longaug'] = 'August';
+$labels['longsep'] = 'September';
+$labels['longoct'] = 'October';
+$labels['longnov'] = 'November';
+$labels['longdec'] = 'December';
 $labels['today'] = 'Today';
 $labels['checkmail'] = 'Check for new messages';
 $labels['writenewmessage'] = 'Create a new message';
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index bd88e52f9..2e5f1bab2 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -103,18 +103,18 @@ $labels['nov']	= 'Nov';
 $labels['dec']	= 'Dec';
 
 // months long
-$labels['january']	= 'January';
-$labels['february'] 	= 'February';
-$labels['march']	= 'March';
-$labels['april']	= 'April';
-$labels['may']		= 'May';
-$labels['june']		= 'June';
-$labels['july']		= 'July';
-$labels['august']	= 'August';
-$labels['september'] 	= 'September';
-$labels['october'] 	= 'October';
-$labels['november'] 	= 'November';
-$labels['december'] 	= 'December';
+$labels['longjan']	= 'January';
+$labels['longfeb']	= 'February';
+$labels['longmar']	= 'March';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'May';
+$labels['longjun']	= 'June';
+$labels['longjul']	= 'July';
+$labels['longaug']	= 'August';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'October';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'December';
 
 $labels['today'] = 'Today';
 
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index 42d9ceb7d..e0d880594 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -80,17 +80,18 @@ $labels['sep'] = 'Sep';
 $labels['oct'] = 'Okt';
 $labels['nov'] = 'Nov';
 $labels['dec'] = 'Dec';
-$labels['january'] = 'Januari';
-$labels['february'] = 'Februari';
-$labels['march'] = 'Maart';
-$labels['april'] = 'April';
-$labels['june'] = 'Juni';
-$labels['july'] = 'Juli';
-$labels['august'] = 'Augustus';
-$labels['september'] = 'September';
-$labels['october'] = 'Oktober';
-$labels['november'] = 'November';
-$labels['december'] = 'December';
+$labels['longjan'] = 'Januari';
+$labels['longfeb'] = 'Februari';
+$labels['longmar'] = 'Maart';
+$labels['longapr'] = 'April';
+$labels['longmay'] = 'Mei';
+$labels['longjun'] = 'Juni';
+$labels['longjul'] = 'Juli';
+$labels['longaug'] = 'Augustus';
+$labels['longsep'] = 'September';
+$labels['longoct'] = 'Oktober';
+$labels['longnov'] = 'November';
+$labels['longdec'] = 'December';
 $labels['today'] = 'Vandaag';
 $labels['checkmail'] = 'Controleer op nieuwe berichten';
 $labels['writenewmessage'] = 'Nieuw bericht';
diff --git a/program/localization/pl/labels.inc b/program/localization/pl/labels.inc
index 61775e00c..cb358d167 100644
--- a/program/localization/pl/labels.inc
+++ b/program/localization/pl/labels.inc
@@ -84,18 +84,18 @@ $labels['sep'] = 'wrz';
 $labels['oct'] = 'paź';
 $labels['nov'] = 'lis';
 $labels['dec'] = 'gru';
-$labels['january'] = 'styczeń';
-$labels['february'] = 'luty';
-$labels['march'] = 'marzec';
-$labels['april'] = 'kwiecień';
-$labels['may'] = 'maj';
-$labels['june'] = 'czerwiec';
-$labels['july'] = 'lipiec';
-$labels['august'] = 'sierpień';
-$labels['september'] = 'wrzesień';
-$labels['october'] = 'październik';
-$labels['november'] = 'listopad';
-$labels['december'] = 'grudzień';
+$labels['longjan'] = 'styczeń';
+$labels['longfeb'] = 'luty';
+$labels['longmar'] = 'marzec';
+$labels['longapr'] = 'kwiecień';
+$labels['longmay'] = 'maj';
+$labels['longjun'] = 'czerwiec';
+$labels['longjul'] = 'lipiec';
+$labels['longaug'] = 'sierpień';
+$labels['longsep'] = 'wrzesień';
+$labels['longoct'] = 'październik';
+$labels['longnov'] = 'listopad';
+$labels['longdec'] = 'grudzień';
 $labels['today'] = 'Dzisiaj';
 $labels['checkmail'] = 'Sprawdź skrzynkę';
 $labels['writenewmessage'] = 'Utwórz nową wiadomość';