Merge remote-tracking branch 'origin/release-v0.6.7' into develop

# Conflicts:
#	Riot.xcodeproj/project.pbxproj
This commit is contained in:
manuroe
2017-12-27 16:23:42 +01:00
5 changed files with 79 additions and 18 deletions
+3 -2
View File
@@ -3953,8 +3953,9 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
[NSBundle mxk_setLanguage:language];
// Store user settings
[[NSUserDefaults standardUserDefaults] setObject:language forKey:@"appLanguage"];
[[NSUserDefaults standardUserDefaults] synchronize];
NSUserDefaults *sharedUserDefaults = [MXKAppSettings standardAppSettings].sharedUserDefaults;
[sharedUserDefaults setObject:language forKey:@"appLanguage"];
[sharedUserDefaults synchronize];
// Do a reload in order to recompute strings in the new language
// Note that "reloadMatrixSessions:NO" will reset room summaries