Version 3.0.382

This commit is contained in:
Anja 2024-04-16 11:29:40 +02:00
parent 3a363acf3a
commit a7117bc0f1
31 changed files with 252 additions and 251 deletions

View file

@ -1,7 +1,6 @@
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@ -14,12 +13,10 @@ namespace ShareeBike.MultilingualResources {
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// This class was generated by MSBuild using the GenerateResource task.
/// To add or remove a member, edit your .resx file then rerun MSBuild.
/// </summary>
// This class was auto-generated by the StronglyTypedResourceBuilder
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Build.Tasks.StronglyTypedResourceBuilder", "15.1.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class AppResources {
@ -177,15 +174,6 @@ namespace ShareeBike.MultilingualResources {
}
}
/// <summary>
/// Looks up a localized string similar to Reserve bike.
/// </summary>
public static string ActionReserveBike {
get {
return ResourceManager.GetString("ActionReserveBike", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Connect lock.
/// </summary>

View file

@ -24,9 +24,6 @@
<data name="ActionOpenLockAndRentBike" xml:space="preserve">
<value>Miete starten &amp; Schloss öffnen</value>
</data>
<data name="ActionReserveBike" xml:space="preserve">
<value>Rad reservieren</value>
</data>
<data name="ActionEndRental" xml:space="preserve">
<value>Miete beenden</value>
</data>

View file

@ -1412,9 +1412,6 @@ You can find your rented bikes under "My bikes".</value>
<data name="QuestionRentalProcessRentBikeTitle" xml:space="preserve">
<value>Rent bike?</value>
</data>
<data name="ActionReserveBike" xml:space="preserve">
<value>Reserve bike</value>
</data>
<data name="QuestionRentalProcessReserveBikeText" xml:space="preserve">
<value>Would you like to reserve the bike for {1} minutes free of charge?</value>
</data>

View file

@ -22,10 +22,6 @@
<source>Start rental &amp; Open lock</source>
<target state="translated">Miete starten &amp; Schloss öffnen</target>
</trans-unit>
<trans-unit id="ActionReserveBike" translate="yes" xml:space="preserve">
<source>Reserve bike</source>
<target state="final">Rad reservieren</target>
</trans-unit>
<trans-unit id="ActionEndRental" translate="yes" xml:space="preserve">
<source>End rental</source>
<target state="translated">Miete beenden</target>

View file

@ -1,4 +1,5 @@
using ShareeBike.Model.State;
using ShareeBike.Model.State;
using ShareeBike.MultilingualResources;
namespace ShareeBike.ViewModel.Bikes.Bike.BC
{
@ -10,13 +11,13 @@ namespace ShareeBike.ViewModel.Bikes.Bike.BC
switch (state)
{
case InUseStateEnum.Disposable:
return "Rad reservieren";
return AppResources.ActionRequestBike;
case InUseStateEnum.Reserved:
return "Reservierung aufheben";
return AppResources.ActionCancelReservation;
case InUseStateEnum.Booked:
return "Miete beenden";
return AppResources.ActionEndRental;
default:
return $"{state}";

View file

@ -29,7 +29,7 @@ namespace ShareeBike.ViewModel.Bikes.Bike.CopriLock.RequestHandler
IBikesViewModel bikesViewModel,
IUser activeUser) : base(
selectedBike,
AppResources.ActionOpenLockAndRentBike, // Button text: "Schloss öffnen & Rad mieten"
AppResources.ActionOpenLockAndRentBike, // Button text: "Miete starten & Schloss öffnen"
true, // Show copri button to enable booking and opening
isConnectedDelegate,
connectorFactory,
@ -39,7 +39,7 @@ namespace ShareeBike.ViewModel.Bikes.Bike.CopriLock.RequestHandler
bikesViewModel,
activeUser)
{
LockitButtonText = AppResources.ActionReserveBike; // Copri text: "Rad reservieren"
LockitButtonText = AppResources.ActionRequestBike; // Copri text: "Reservieren / Mieten"
IsLockitButtonVisible = true;
}