Merge pull request #150 from owncloud/OC-4585_http

Oc 4585 http
owncloud · Aug 20, 2014 · 105b541 · 105b541
2 parents 597ed29 + 37ddff4
commit 105b541
Show file tree

Hide file tree

Showing 7 changed files with 160 additions and 226 deletions.
diff --git a/Owncloud iOs Client/Login/Login/LoginViewController.h b/Owncloud iOs Client/Login/Login/LoginViewController.h
@@ -28,8 +28,7 @@ extern NSString *loginViewControllerRotate;
     CGRect refreshButtonFrame;
     CGRect showPasswordButtonFrame;
     CGRect lockImageFrame;
-    CGRect okNokImageFrameFooter1;
-    CGRect okNokImageFrameFooter2;
+    CGRect okNokImageFrameFooter;
     CGRect textFooterFrame1;
     CGRect textFooterFrame2;
     CGRect footerSection1Frame;
@@ -49,6 +48,7 @@ extern NSString *loginViewControllerRotate;
     BOOL isConnectionToServer;
     BOOL isNeedToCheckAgain;
     BOOL isHttps;
+    BOOL isHttpsSecure;
     BOOL isCheckingTheServerRightNow;
     BOOL isSSLAccepted;
     BOOL isErrorOnCredentials;

diff --git a/Owncloud iOs Client/Login/Login/LoginViewController.m b/Owncloud iOs Client/Login/Login/LoginViewController.m
diff --git a/Owncloud iOs Client/SupportingFiles/Languages/de.lproj/Localizable.strings b/Owncloud iOs Client/SupportingFiles/Languages/de.lproj/Localizable.strings
@@ -14,6 +14,7 @@
 "testing_connection" = "Verbindung testen";
 "server_instance_not_found" = "Server nicht gefunden";
 "secure_connection_established" = "Sichere Verbindung hergestellt";
+"https_non_secure_connection_established" = "Weiterleitung über unsichere Verbindung";
 "connection_established" = "Verbindung hergestellt";
 "login_details" = "Anmeldedetails";
 "username" = "Benutzer";
@@ -22,9 +23,9 @@
 "cancel" = "Abbrechen";
 "error_login_message" = "Bitte Zugangsdaten überprüfen und erneut probieren";
 "ok" = "OK";
-"url_sample" = "http://a.b.c.d/owncloud/";
+"url_sample" = "Server-Adresse https://...";
 "forbidden_characters" = "Das Passwort enthält ungültige Zeichen!";
-"server" = "Server-Adresse https://...";
+"server" = "Server";
 "url" = "URL";
 "session_expired" = "Die Sitzung ist abgelaufen";
 "credentials_different_user" = "Die eingegebenen Zugangsdaten sind nicht vom selben Benutzer";

diff --git a/Owncloud iOs Client/SupportingFiles/Languages/en.lproj/Localizable.strings b/Owncloud iOs Client/SupportingFiles/Languages/en.lproj/Localizable.strings
@@ -14,6 +14,7 @@
 "testing_connection" = "Testing Connection";
 "server_instance_not_found" = "Server not found";
 "secure_connection_established" = "Secure Connection Established";
+"https_non_secure_connection_established" = "Redirected through an unsecured route";
 "connection_established" = "Connection Established";
 "login_details" = "Login Details";
 "username" = "Username";

diff --git a/Owncloud iOs Client/SupportingFiles/Languages/es.lproj/Localizable.strings b/Owncloud iOs Client/SupportingFiles/Languages/es.lproj/Localizable.strings
@@ -14,6 +14,7 @@
 "testing_connection" = "Probando conexión";
 "server_instance_not_found" = "Servidor no encontrado";
 "secure_connection_established" = "Conexión segura establecida";
+"https_non_secure_connection_established" = "Redirigido por una ruta insegura";
 "connection_established" = "Conexión establecida";
 "login_details" = "Detalles de inicio de sesión";
 "username" = "Usuario";

diff --git a/Owncloud iOs Client/SupportingFiles/Languages/fr.lproj/Localizable.strings b/Owncloud iOs Client/SupportingFiles/Languages/fr.lproj/Localizable.strings
@@ -14,6 +14,7 @@
 "testing_connection" = "Test de connexion";
 "server_instance_not_found" = "Serveur introuvable";
 "secure_connection_established" = "Connexion sécurisée établie";
+"https_non_secure_connection_established" = "Redirigée par une voie peu sûre";
 "connection_established" = "Connexion établie";
 "login_details" = "Informations de connexion";
 "username" = "Identifiant";

diff --git a/Owncloud iOs Client/SupportingFiles/Languages/it.lproj/Localizable.strings b/Owncloud iOs Client/SupportingFiles/Languages/it.lproj/Localizable.strings
@@ -14,6 +14,7 @@
 "testing_connection" = "Prova la connessione";
 "server_instance_not_found" = "Server non trovato";
 "secure_connection_established" = "Connessione sicura stabilita";
+"https_non_secure_connection_established" = "Redirect da un percorso pericoloso";
 "connection_established" = "Connessione stabilita";
 "login_details" = "Dettagli sessione";
 "username" = "Utente";