From fd806ea74c452e0bccd094580dd342668f7ad3ba Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Sun, 12 Apr 2020 11:12:56 +0200 Subject: [PATCH] Fix startpage --- lib/i18n/i18n.dart | 3 +++ lib/i18n/intl_de.arb | 5 +++++ lib/i18n/intl_messages.arb | 7 +++++- lib/i18n/messages_de.dart | 1 + lib/i18n/messages_messages.dart | 1 + lib/views/homeserver_picker.dart | 4 ++-- pubspec.lock | 37 +++++++++++++------------------- pubspec.yaml | 2 +- 8 files changed, 34 insertions(+), 26 deletions(-) diff --git a/lib/i18n/i18n.dart b/lib/i18n/i18n.dart index 99b02de..ba81792 100644 --- a/lib/i18n/i18n.dart +++ b/lib/i18n/i18n.dart @@ -752,6 +752,9 @@ class I18n { String get wednesday => Intl.message("Wednesday"); + String get welcomeText => Intl.message( + 'Welcome to the cutest instant messenger in the matrix network.'); + String get whoIsAllowedToJoinThisGroup => Intl.message("Who is allowed to join this group"); diff --git a/lib/i18n/intl_de.arb b/lib/i18n/intl_de.arb index 4f0a3fc..72d26d1 100644 --- a/lib/i18n/intl_de.arb +++ b/lib/i18n/intl_de.arb @@ -1241,6 +1241,11 @@ "type": "text", "placeholders": {} }, + "Welcome to the cutest instant messenger in the matrix network.": "Herzlich willkommen beim knuffigsten Instant Messenger im Matrix-Netwerk.", + "@Welcome to the cutest instant messenger in the matrix network.": { + "type": "text", + "placeholders": {} + }, "Who is allowed to join this group": "Wer darf der Gruppe beitreten", "@Who is allowed to join this group": { "type": "text", diff --git a/lib/i18n/intl_messages.arb b/lib/i18n/intl_messages.arb index 5e9e7ef..ce83a93 100644 --- a/lib/i18n/intl_messages.arb +++ b/lib/i18n/intl_messages.arb @@ -1,5 +1,5 @@ { - "@@last_modified": "2020-04-12T10:36:42.980311", + "@@last_modified": "2020-04-12T11:11:56.595233", "About": "About", "@About": { "type": "text", @@ -1241,6 +1241,11 @@ "type": "text", "placeholders": {} }, + "Welcome to the cutest instant messenger in the matrix network.": "Welcome to the cutest instant messenger in the matrix network.", + "@Welcome to the cutest instant messenger in the matrix network.": { + "type": "text", + "placeholders": {} + }, "Who is allowed to join this group": "Who is allowed to join this group", "@Who is allowed to join this group": { "type": "text", diff --git a/lib/i18n/messages_de.dart b/lib/i18n/messages_de.dart index f643917..3ffd747 100644 --- a/lib/i18n/messages_de.dart +++ b/lib/i18n/messages_de.dart @@ -294,6 +294,7 @@ class MessageLookup extends MessageLookupByLibrary { "Voice message" : MessageLookupByLibrary.simpleMessage("Sprachnachricht"), "Wallpaper" : MessageLookupByLibrary.simpleMessage("Hintergrund"), "Wednesday" : MessageLookupByLibrary.simpleMessage("Mittwoch"), + "Welcome to the cutest instant messenger in the matrix network." : MessageLookupByLibrary.simpleMessage("Herzlich willkommen beim knuffigsten Instant Messenger im Matrix-Netwerk."), "Who is allowed to join this group" : MessageLookupByLibrary.simpleMessage("Wer darf der Gruppe beitreten"), "Write a message..." : MessageLookupByLibrary.simpleMessage("Schreibe eine Nachricht ..."), "Yes" : MessageLookupByLibrary.simpleMessage("Ja"), diff --git a/lib/i18n/messages_messages.dart b/lib/i18n/messages_messages.dart index 8863978..29665f3 100644 --- a/lib/i18n/messages_messages.dart +++ b/lib/i18n/messages_messages.dart @@ -294,6 +294,7 @@ class MessageLookup extends MessageLookupByLibrary { "Voice message" : MessageLookupByLibrary.simpleMessage("Voice message"), "Wallpaper" : MessageLookupByLibrary.simpleMessage("Wallpaper"), "Wednesday" : MessageLookupByLibrary.simpleMessage("Wednesday"), + "Welcome to the cutest instant messenger in the matrix network." : MessageLookupByLibrary.simpleMessage("Welcome to the cutest instant messenger in the matrix network."), "Who is allowed to join this group" : MessageLookupByLibrary.simpleMessage("Who is allowed to join this group"), "Write a message..." : MessageLookupByLibrary.simpleMessage("Write a message..."), "Yes" : MessageLookupByLibrary.simpleMessage("Yes"), diff --git a/lib/views/homeserver_picker.dart b/lib/views/homeserver_picker.dart index dc63435..7d6d14e 100644 --- a/lib/views/homeserver_picker.dart +++ b/lib/views/homeserver_picker.dart @@ -45,7 +45,7 @@ class HomeserverPicker extends StatelessWidget { Padding( padding: const EdgeInsets.all(16.0), child: Text( - 'Welcome to the cutest instant messaging solution for all platforms.', + I18n.of(context).welcomeText, textAlign: TextAlign.center, style: TextStyle( fontSize: 22, @@ -66,7 +66,7 @@ class HomeserverPicker extends StatelessWidget { borderRadius: BorderRadius.circular(6), ), child: Text( - I18n.of(context).connect, + I18n.of(context).connect.toUpperCase(), style: TextStyle(color: Colors.white, fontSize: 16), ), onPressed: () => _checkHomeserverAction( diff --git a/pubspec.lock b/pubspec.lock index f8204f5..8b327a2 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -21,28 +21,28 @@ packages: name: archive url: "https://pub.dartlang.org" source: hosted - version: "2.0.13" + version: "2.0.11" args: dependency: transitive description: name: args url: "https://pub.dartlang.org" source: hosted - version: "1.6.0" + version: "1.5.2" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.4.1" + version: "2.4.0" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "1.0.5" bubble: dependency: "direct main" description: @@ -63,14 +63,14 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.1.3" + version: "1.1.2" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.14.12" + version: "1.14.11" convert: dependency: transitive description: @@ -91,7 +91,7 @@ packages: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "2.1.4" + version: "2.1.3" csslib: dependency: transitive description: @@ -267,7 +267,7 @@ packages: name: image url: "https://pub.dartlang.org" source: hosted - version: "2.1.12" + version: "2.1.4" image_picker: dependency: "direct main" description: @@ -281,7 +281,7 @@ packages: name: intl url: "https://pub.dartlang.org" source: hosted - version: "0.16.1" + version: "0.16.0" intl_translation: dependency: "direct main" description: @@ -509,7 +509,7 @@ packages: name: quiver url: "https://pub.dartlang.org" source: hosted - version: "2.1.3" + version: "2.0.5" receive_sharing_intent: dependency: "direct main" description: @@ -577,7 +577,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.5.5" sqflite: dependency: "direct main" description: @@ -626,21 +626,21 @@ packages: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.13.0" + version: "1.9.4" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.15" + version: "0.2.11" test_core: dependency: transitive description: name: test_core url: "https://pub.dartlang.org" source: hosted - version: "0.3.1" + version: "0.2.15" typed_data: dependency: transitive description: @@ -725,13 +725,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.1.0" - webkit_inspection_protocol: - dependency: transitive - description: - name: webkit_inspection_protocol - url: "https://pub.dartlang.org" - source: hosted - version: "0.5.0+1" webview_flutter: dependency: "direct main" description: @@ -745,7 +738,7 @@ packages: name: xml url: "https://pub.dartlang.org" source: hosted - version: "3.6.1" + version: "3.5.0" yaml: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 9d16103..2df3eff 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ description: Chat with your friends. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 0.12.2+34 +version: 0.12.3+35 environment: sdk: ">=2.6.0 <3.0.0"