infotext and display city formatting

Pages/Fundvelo/CaritasServiceFundVeloFoundKeyDataPage.razor.cs

@@ -77,15 +77,15 @@ namespace cwebplusApp.Pages {
         }
 
         protected async Task<string> GetFormattedAddressZipAndTown(ReportDataProvider ReportDataProvider) {
-            if (addressDto == null) {
+            if (this.addressDto == null) {
                 this.bicycleGeoPosition.Latitude = ReportDataProvider.GetFoundReport().GeographicInfo.Latitude;
                 this.bicycleGeoPosition.Longitude = ReportDataProvider.GetFoundReport().GeographicInfo.Longitude;
-                addressDto = await NominatimService.GetAddressForCoordinates(this.bicycleGeoPosition.Latitude, this.bicycleGeoPosition.Longitude);
-                if (addressDto == null) {
-                    addressDto = new();
-                    addressDto.address = new();
-                    addressDto.address.postcode = ReportDataProvider.GetFoundReport().GeographicInfo.Postcode;
-                    addressDto.address.town = ReportDataProvider.GetFoundReport().GeographicInfo.Town;
+                this.addressDto = await NominatimService.GetAddressForCoordinates(this.bicycleGeoPosition.Latitude, this.bicycleGeoPosition.Longitude);
+                if (this.addressDto == null) {
+                    this.addressDto = new();
+                    this.addressDto.address = new();
+                    this.addressDto.address.postcode = ReportDataProvider.GetFoundReport().GeographicInfo.Postcode;
+                    this.addressDto.address.town = ReportDataProvider.GetFoundReport().GeographicInfo.Town;
                 }
             }
             return GetFormattedAddressZipAndTown(addressDto);
@@ -142,7 +142,7 @@ namespace cwebplusApp.Pages {
             string zip = SplitAndGetFirstPostcode(addressDto.address.postcode);
             string town = addressDto.address.city ?? addressDto.address.town ?? addressDto.address.village;
 
-            return !String.IsNullOrEmpty(country_code) ? country_code.ToUpper() + "-" + zip + " " + town : zip + " " + town;
+            return (!String.IsNullOrEmpty(country_code) ? country_code.ToUpper() + "-" + zip + " " + town : zip + " " + town).TrimEnd();
         }
 
         private static string SplitAndGetFirstPostcode(string postcode) {

Pages/InfoPage.razor

@@ -17,7 +17,10 @@
         <table class="w-100">
             <tr>
                 <td class="text-center">
-                    <p class="text-left" style="max-width: 500px;display:inline-block">@I18n["Abouttext"]</p>
+                    <span class="text-left" style="max-width: 500px;display:inline-block;font-size:smaller">
+                        <pre style="white-space:pre-line;font-family:'Ubuntu';margin-bottom:0">@I18n["App.Info"]</pre>
+                        <p><a href="https://www.kulturlegi.ch">https://www.kulturlegi.ch</a></p>
+                    </span>
                 </td>
             </tr>
             <tr>

Shared/ResourceFiles/Resources.de.resx

@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Abouttext" xml:space="preserve">
-    <value>Hier komt ein Informationstext über die App.</value>
-  </data>
   <data name="account" xml:space="preserve">
     <value>Konto</value>
   </data>
@@ -135,6 +132,18 @@
   <data name="AlternatePickupContact" xml:space="preserve">
     <value>Abweichender Abholkontakt</value>
   </data>
+  <data name="App.Info" xml:space="preserve">
+    <value>Die Cweb+ App ist eine eigenständige Mobile-App. Sie ist integraler Bestandteil der Applikation/Plattform von Caritas.
+
+Fundvelo:
+Dieser Dienst ermöglicht es Bürgern und Behörden auf einfachste Art und Weise Velos zu melden, welche vermutlich gestohlen wurden. Wenn man selbst ein Velo vermisst, so soll die App die wichtigsten Infos zusammenfassen, wo/wie man eventuell wieder an sein Velo kommt. Somit ergeben sich zwei Funktionen:
+• Velo gefunden
+• Velo vermisst
+
+KulturLegi:
+Armut führt häufig zu einer eingeschränkten Teilnahme am gesellschaftlichen und kulturellen Leben bis hin zu sozialer Isolation.
+Die KulturLegi wirkt dem entgegen indem sie Kultur-, Bildungs- und Sportangebote für Menschen an der Armutsgrenze erschwinglich macht und so ihre Integration in das gesellschaftliche Leben fördert. Dieser Dienst ermöglicht das Anfordern und Verwalten der KulturLegi in elektronischer Form.</value>
+  </data>
   <data name="App.version" xml:space="preserve">
     <value>Version: {0}</value>
   </data>

Shared/ResourceFiles/Resources.fr.resx

@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Abouttext" xml:space="preserve">
-    <value>Ici on va voir une text informatif sur l'app.</value>
-  </data>
   <data name="account" xml:space="preserve">
     <value>Compte</value>
   </data>
@@ -135,6 +132,18 @@
   <data name="AlternatePickupContact" xml:space="preserve">
     <value>Contact de ramassage déviant</value>
   </data>
+  <data name="App.Info" xml:space="preserve">
+    <value>L'application Cweb+ est une application mobile autonome. Il fait partie intégrante de l'application/plateforme Caritas.
+
+Vélo perdu et trouvé :
+Ce service permet aux citoyens et aux autorités de signaler facilement les bicyclettes suspectées d'avoir été volées. Si vous avez vous-même perdu un vélo, l'application doit résumer les informations les plus importantes sur le lieu et la manière dont vous pouvez éventuellement récupérer votre vélo. Il en résulte deux fonctions :
+• Signaler un vélo trouvé
+• Soumettre une demande de recherche pour vélo manquant
+
+KulturLegi :
+La pauvreté entraîne souvent une participation limitée à la vie sociale et culturelle, voire un isolement social.
+La KulturLegi s'attaque à ce problème en rendant les activités culturelles, éducatives et sportives abordables pour les personnes sous le seuil de pauvreté, favorisant ainsi leur intégration dans la vie sociale. Ce service permet de demander et de gérer la KulturLegi sous forme électronique.</value>
+  </data>
   <data name="App.version" xml:space="preserve">
     <value>Version: {0}</value>
   </data>

Shared/ResourceFiles/Resources.it.resx

@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Abouttext" xml:space="preserve">
-    <value>Qui appare un testo informativo sull'app.</value>
-  </data>
   <data name="account" xml:space="preserve">
     <value>Profilo</value>
   </data>
@@ -135,6 +132,18 @@
   <data name="AlternatePickupContact" xml:space="preserve">
     <value>Contatto di prelievo deviante</value>
   </data>
+  <data name="App.Info" xml:space="preserve">
+    <value>L'applicazione Cweb+ è un'applicazione mobile indipendente. È parte integrante dell'app/piattaforma Caritas.
+
+Bici persa e ritrovata:
+Questo servizio permette ai cittadini e alle autorità di segnalare facilmente le biciclette che si sospetta siano state rubate. Se tu stesso hai perso una bici, l'app dovrebbe riassumere le informazioni più importanti su dove/come puoi eventualmente recuperare la tua bici. Questo si traduce in due funzioni:
+• Segnala il ritrovamento di una bicicletta
+• Invia una richiesta di ricerca per bicicletta scomparsa
+
+KulturLegi:
+La povertà porta spesso a una partecipazione limitata alla vita sociale e culturale e persino all'isolamento sociale.
+La KulturLegi si oppone a questo rendendo le attività culturali, educative e sportive accessibili alle persone sulla soglia di povertà, promuovendo così la loro integrazione nella vita sociale. Questo servizio permette di richiedere e gestire la KulturLegi in forma elettronica.</value>
+  </data>
   <data name="App.version" xml:space="preserve">
     <value>Versione: {0}</value>
   </data>

Shared/ResourceFiles/Resources.resx

@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Abouttext" xml:space="preserve">
-    <value>Here you will read some information about the app.</value>
-  </data>
   <data name="account" xml:space="preserve">
     <value>Account</value>
   </data>
@@ -135,6 +132,18 @@
   <data name="AlternatePickupContact" xml:space="preserve">
     <value>Alternate Pickup Contact</value>
   </data>
+  <data name="App.Info" xml:space="preserve">
+    <value>The Cweb+ app is a standalone mobile app. It is an integral part of the Caritas app/platform.
+
+Lost and Found Bike:
+This service allows citizens and authorities to easily report bikes that are suspected to have been stolen. If you are missing a bike yourself, the app should summarise the most important information on where/how you can possibly get your bike back. This results in two functions:
+• Report a found bike
+• Submit search request for missing bike
+
+KulturLegi:
+Poverty often leads to limited participation in social and cultural life and even to social isolation.
+The KulturLegi counteracts this by making cultural, educational and sporting activities affordable for people on the poverty line, thus promoting their integration into social life. This service makes it possible to apply for and manage the KulturLegi in electronic form.</value>
+  </data>
   <data name="App.version" xml:space="preserve">
     <value>Version: {0}</value>
   </data>