Prechádzať zdrojové kódy

Adjust compatibility note to include iOS

Icon for iOS is still missing.
Danilo Bargen 7 rokov pred
rodič
commit
b3d342612c

+ 3 - 3
docs/self_hosting.md

@@ -10,7 +10,7 @@ The following components can be self-hosted:
 - STUN / TURN Server
 - STUN / TURN Server
 
 
 The push relay server could in theory be self-hosted too, but it won't help as
 The push relay server could in theory be self-hosted too, but it won't help as
-the GCM API Key required to dispatch push notifications is not public.
+the GCM / APNs API keys required to dispatch push notifications are not public.
 
 
 If you have questions, please [open an
 If you have questions, please [open an
 issue](https://github.com/threema-ch/threema-web/issues) on Github.
 issue](https://github.com/threema-ch/threema-web/issues) on Github.
@@ -65,7 +65,7 @@ You can run any WebRTC-compliant STUN / TURN server, e.g.
 ## Push Relay
 ## Push Relay
 
 
 While you could in theory host your own version of the push server, it won't
 While you could in theory host your own version of the push server, it won't
-help much since the GCM API Key required to dispatch push notifications to the
-Threema Android app is not public.
+help much since the GCM / APNs API Keys required to dispatch push notifications
+to the Threema app are not public.
 
 
 You can review the code on Github though: https://github.com/threema-ch/push-relay
 You can review the code on Github though: https://github.com/threema-ch/push-relay

+ 2 - 2
index.html

@@ -79,8 +79,8 @@
             </div>
             </div>
             <div id="main-content" ui-view></div>
             <div id="main-content" ui-view></div>
         </div>
         </div>
-        <div class="androidonly" ng-controller="AndroidOnlyController as ctrl" ng-show="ctrl.show">
-            <div><i class="material-icons md-24">android</i> <span translate>welcome.ANDROID_ONLY</span></div>
+        <div class="android-ios-only" ng-controller="AndroidIosOnlyController as ctrl" ng-show="ctrl.show">
+            <div><i class="material-icons md-24">android</i> <span translate>welcome.ANDROID_IOS_ONLY</span></div>
         </div>
         </div>
         <footer>
         <footer>
             <ul>
             <ul>

+ 1 - 1
public/i18n/de.json

@@ -22,7 +22,7 @@
         "FORGET_SESSION": "gespeicherte Sitzung löschen",
         "FORGET_SESSION": "gespeicherte Sitzung löschen",
         "BTN_RECONNECT": "Verbindung aufbauen",
         "BTN_RECONNECT": "Verbindung aufbauen",
         "BROWSER_NOT_SUPPORTED": "Dieser Browser wird nicht unterst\u00fctzt",
         "BROWSER_NOT_SUPPORTED": "Dieser Browser wird nicht unterst\u00fctzt",
-        "ANDROID_ONLY": "Kompatibel mit Threema für Android.",
+        "ANDROID_IOS_ONLY": "Kompatibel mit Threema für Android und iOS.",
         "CONNECTING": "Verbindung wird aufgebaut",
         "CONNECTING": "Verbindung wird aufgebaut",
         "WAITING_FOR_PUSH": "Threema-App wird<br>aufgeweckt …",
         "WAITING_FOR_PUSH": "Threema-App wird<br>aufgeweckt …",
         "CONNECTING_TO_APP": "Verbindung zu App<br>wird aufgebaut …",
         "CONNECTING_TO_APP": "Verbindung zu App<br>wird aufgebaut …",

+ 1 - 1
public/i18n/en.json

@@ -22,7 +22,7 @@
         "FORGET_SESSION": "forget this session",
         "FORGET_SESSION": "forget this session",
         "BTN_RECONNECT": "Reconnect",
         "BTN_RECONNECT": "Reconnect",
         "BROWSER_NOT_SUPPORTED": "This browser is not supported",
         "BROWSER_NOT_SUPPORTED": "This browser is not supported",
-        "ANDROID_ONLY": "Compatible with Threema for Android.",
+        "ANDROID_IOS_ONLY": "Compatible with Threema for Android and iOS.",
         "CONNECTING": "Connecting",
         "CONNECTING": "Connecting",
         "WAITING_FOR_PUSH": "Waiting for<br>app wakeup …",
         "WAITING_FOR_PUSH": "Waiting for<br>app wakeup …",
         "CONNECTING_TO_APP": "Connection to app is<br>being established …",
         "CONNECTING_TO_APP": "Connection to app is<br>being established …",

+ 2 - 2
src/controllers.ts

@@ -15,12 +15,12 @@
  * along with Threema Web. If not, see <http://www.gnu.org/licenses/>.
  * along with Threema Web. If not, see <http://www.gnu.org/licenses/>.
  */
  */
 
 
-import {AndroidOnlyController} from './controllers/android_only';
+import {AndroidIosOnlyController} from './controllers/android_ios_only';
 import {StatusController} from './controllers/status';
 import {StatusController} from './controllers/status';
 
 
 angular.module('3ema.controllers', ['3ema.services'])
 angular.module('3ema.controllers', ['3ema.services'])
 
 
-.controller('AndroidOnlyController', AndroidOnlyController)
+.controller('AndroidIosOnlyController', AndroidIosOnlyController)
 .controller('StatusController', StatusController)
 .controller('StatusController', StatusController)
 
 
 ;
 ;

+ 2 - 2
src/controllers/android_only.ts → src/controllers/android_ios_only.ts

@@ -16,9 +16,9 @@
  */
  */
 
 
 /**
 /**
- * Controller to show or hide the "Android only" note at the bottom of the welcome screen.
+ * Controller to show or hide the "Android / iOS only" note at the bottom of the welcome screen.
  */
  */
-export class AndroidOnlyController {
+export class AndroidIosOnlyController {
     public show: boolean = false;
     public show: boolean = false;
 
 
     public static $inject = ['$rootScope'];
     public static $inject = ['$rootScope'];

+ 1 - 1
src/sass/layout/_main.scss

@@ -264,7 +264,7 @@ a.click-action {
     @include mouse-hand;
     @include mouse-hand;
 }
 }
 
 
-.androidonly {
+.android-ios-only {
     width: 100%;
     width: 100%;
     margin: 10px auto 0;
     margin: 10px auto 0;
     background-color: white;
     background-color: white;