From e5c818de5caac9ba794d2d2a17443815a280e87e Mon Sep 17 00:00:00 2001 From: bluearevalo <90929912+bluearevalo@users.noreply.github.com> Date: Mon, 1 Jul 2024 15:19:32 -0400 Subject: [PATCH] changed code so getAppVersion supported l10n, added en and es translations --- assets/l10n/intl_en.arb | 20 +++- assets/l10n/intl_es.arb | 18 ++- lib/pages/settings/settings_view.dart | 8 +- needed-translations.txt | 152 +++++++++++++++++--------- 4 files changed, 139 insertions(+), 59 deletions(-) diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb index 9cb76ad5a..3281b68e4 100644 --- a/assets/l10n/intl_en.arb +++ b/assets/l10n/intl_en.arb @@ -4072,6 +4072,24 @@ "versionNotFound": "Version Not Found", "fetchingVersion": "Fetching version...", "versionFetchError": "Error fetching version", - "connectedToStaging": "Connected to Staging" + "connectedToStaging": "Connected to Staging", + "versionText": "Version: {version}+{buildNumber}", + "@versionText": { + "description": "Text displaying the app version and build number.", + "type": "text", + "placeholders": { + "version": { + "type": "String", + "description": "The current version of the app." + }, + "buildNumber": { + "type": "String", + "description": "The build number of the app." + } + } + } + + + } \ No newline at end of file diff --git a/assets/l10n/intl_es.arb b/assets/l10n/intl_es.arb index b88f8108c..6cc89cc65 100644 --- a/assets/l10n/intl_es.arb +++ b/assets/l10n/intl_es.arb @@ -4679,5 +4679,21 @@ "versionNotFound": "Versión no encontrada", "fetchingVersion": "Obteniendo versión...", "versionFetchError": "Error al obtener la versión", - "connectedToStaging": "Conectado al entorno de pruebas" + "connectedToStaging": "Conectado al entorno de pruebas", + "versionText": "Versión: {version}+{buildNumber}", + "@versionText": { + "description": "Texto que muestra la versión y el número de compilación de la aplicación.", + "type": "text", + "placeholders": { + "version": { + "type": "String", + "description": "La versión actual de la aplicación." + }, + "buildNumber": { + "type": "String", + "description": "El número de compilación de la aplicación." + } + } + } + } \ No newline at end of file diff --git a/lib/pages/settings/settings_view.dart b/lib/pages/settings/settings_view.dart index 936717b8b..e537f01af 100644 --- a/lib/pages/settings/settings_view.dart +++ b/lib/pages/settings/settings_view.dart @@ -20,9 +20,9 @@ class SettingsView extends StatelessWidget { const SettingsView(this.controller, {super.key}); - Future getAppVersion() async { - PackageInfo packageInfo = await PackageInfo.fromPlatform(); - return 'Version: ${packageInfo.version}+${packageInfo.buildNumber}'; + Future getAppVersion(BuildContext context) async { + PackageInfo packageInfo = await PackageInfo.fromPlatform(); + return L10n.of(context)!.versionText(packageInfo.version, packageInfo.buildNumber); } @@ -262,7 +262,7 @@ class SettingsView extends StatelessWidget { ), // Adding the FutureBuilder here FutureBuilder( - future: getAppVersion(), + future: getAppVersion(context), builder: (context, snapshot) { if (snapshot.connectionState == ConnectionState.done) { return ListTile( diff --git a/needed-translations.txt b/needed-translations.txt index 1fc238303..b0ada0925 100644 --- a/needed-translations.txt +++ b/needed-translations.txt @@ -869,7 +869,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "be": [ @@ -2375,7 +2376,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "bn": [ @@ -3877,7 +3879,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "bo": [ @@ -5383,7 +5386,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "ca": [ @@ -6291,7 +6295,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "cs": [ @@ -7281,7 +7286,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "de": [ @@ -8154,7 +8160,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "el": [ @@ -9611,7 +9618,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "eo": [ @@ -10766,7 +10774,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "es": [ @@ -10813,10 +10822,7 @@ "knockRestricted", "nonexistentSelection", "cantAddSpaceChild", - "roomAddedToSpace", - "versionNotFound", - "fetchingVersion", - "versionFetchError" + "roomAddedToSpace" ], "et": [ @@ -11689,7 +11695,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "eu": [ @@ -12564,7 +12571,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "fa": [ @@ -13576,7 +13584,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "fi": [ @@ -14552,7 +14561,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "fil": [ @@ -15884,7 +15894,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "fr": [ @@ -16895,7 +16906,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "ga": [ @@ -18035,7 +18047,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "gl": [ @@ -18908,7 +18921,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "he": [ @@ -20167,7 +20181,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "hi": [ @@ -21666,7 +21681,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "hr": [ @@ -22618,7 +22634,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "hu": [ @@ -23507,7 +23524,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "ia": [ @@ -24999,7 +25017,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "id": [ @@ -25878,7 +25897,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "ie": [ @@ -27141,7 +27161,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "it": [ @@ -28071,7 +28092,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "ja": [ @@ -29112,7 +29134,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "ka": [ @@ -30472,7 +30495,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "ko": [ @@ -31347,7 +31371,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "lt": [ @@ -32388,7 +32413,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "lv": [ @@ -33269,7 +33295,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "nb": [ @@ -34474,7 +34501,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "nl": [ @@ -35443,7 +35471,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "pl": [ @@ -36421,7 +36450,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "pt": [ @@ -37905,7 +37935,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "pt_BR": [ @@ -38784,7 +38815,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "pt_PT": [ @@ -39990,7 +40022,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "ro": [ @@ -41003,7 +41036,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "ru": [ @@ -41882,7 +41916,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "sk": [ @@ -43154,7 +43189,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "sl": [ @@ -44556,7 +44592,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "sr": [ @@ -45732,7 +45769,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "sv": [ @@ -46642,7 +46680,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "ta": [ @@ -48145,7 +48184,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "th": [ @@ -49602,7 +49642,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "tr": [ @@ -50475,7 +50516,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "uk": [ @@ -51385,7 +51427,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "vi": [ @@ -52743,7 +52786,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "zh": [ @@ -53616,7 +53660,8 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ], "zh_Hant": [ @@ -54770,6 +54815,7 @@ "roomAddedToSpace", "versionNotFound", "fetchingVersion", - "versionFetchError" + "versionFetchError", + "versionText" ] }