Fix Language-Region tags in Web interface

Fixes #3121

NEWS

@@ -17,6 +17,7 @@ Bug fixes
  - fixed freebusy data when 'busy off hours' is enabled and period starts during the weekend
  - fixed fetching of freebusy data from the Web interface
  - fixed EAS handling of Bcc in emails (#3138)
+ - fixed Language-Region tags in Web interface (#3121)
 
 2.2.16 (2015-02-12)
 -------------------

UI/MailerUI/UIxMailEditor.m

@@ -230,7 +230,9 @@ static NSArray *infoKeys = nil;
 - (NSString *) localeCode
 {
   // WARNING : NSLocaleCode is not defined in <Foundation/NSUserDefaults.h>
-  return [locale objectForKey: @"NSLocaleCode"];
+  // Region subtag must be separated by a dash
+  NSString *s = [locale objectForKey: @"NSLocaleCode"];
+  return [s stringByReplacingOccurrencesOfString: @"_" withString: @"-"];
 }
 
 - (void) setFrom: (NSString *) newFrom

UI/Scheduler/UIxCalMainView.m

@@ -82,7 +82,9 @@
 - (NSString *) localeCode
 {
   // WARNING : NSLocaleCode is not defined in <Foundation/NSUserDefaults.h>
-  return [locale objectForKey: @"NSLocaleCode"];
+  // Region subtag must be separated by a dash
+  NSString *s = [locale objectForKey: @"NSLocaleCode"];
+  return [s stringByReplacingOccurrencesOfString: @"_" withString: @"-"];
 }
 
 - (NSArray *) monthMenuItems