allow use of 'full-reset' capability along with 'language/locale' cap…

…ability, if iOS version greater than 6.1. Fixes appium#3763
Rakatak · Oct 14, 2014 · 408bfea · 408bfea
1 parent 0d42acd
commit 408bfea
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/devices/ios/ios.js b/lib/devices/ios/ios.js
@@ -576,8 +576,8 @@ IOS.prototype.setLocale = function (cb) {
 
   if ((this.args.language || this.args.locale || this.args.calendarFormat) && this.args.udid === null) {
 
-    if (this.args.fullReset) {
-      msg = "Cannot set locale information because a full-reset was requested";
+    if (this.args.fullReset && this.args.platformVersion <= 6.1) {
+      msg = "Cannot set locale information because a full-reset was requested. full-reset interferes with the language/locale caps on iOS 6.1 and older";
       logger.error(msg);
       return cb(new Error(msg));
     }