Skip to content

Commit 792c804

Browse files
sjvanssjvans
committed
flows: Canceled -> Rejected
1 parent 736964a commit 792c804

13 files changed

+166
-254
lines changed

‎_i18n/i18n.properties‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
AcceptTravel=Accept Travel
1+
Accept=Accept
22
Agency=Agency
33
AgencyName=Agency Name
44
AvgPrice=Average Price
55
BeginDate=Starting Date
6+
Block=Block
67
Booking=Booking
78
BookingDate=Booking Date
89
BookingDetails=Booking Details
@@ -37,7 +38,9 @@ Price=Price
3738
Prices=Prices
3839
ProductID=Product
3940
ProductPrice=Product Price
40-
RejectTravel=Reject Travel
41+
Reject=Reject
42+
Reopen=Reopen
43+
Review=Review
4144
Status=Status
4245
Street=Street
4346
Sustainability=Sustainability
@@ -49,4 +52,5 @@ TravelAgency=Travel Agency
4952
Travels=Travels
5053
TravelStatus=Travel Status
5154
TreesPlanted=Trees Planted
55+
Unblock=Unblock
5256
WebAddress=Web Address

‎_i18n/i18n_de.properties‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
AcceptTravel=Reise akzeptieren
1+
Accept=Genehmigen
22
Agency=Agentur
33
AgencyName=Agenturname
44
AvgPrice=Durchschnittspreis
55
BeginDate=Startdatum
6+
Block=Sperren
67
Booking=Buchung
78
BookingDate=Buchungsdatum
89
BookingDetails=Buchungsdetails
@@ -35,7 +36,9 @@ Price=Preis
3536
Prices=Preise
3637
ProductID=Produkt
3738
ProductPrice=Produktpreis
38-
RejectTravel=Reise ablehnen
39+
Reject=Ablehnen
40+
Reopen=Wiedereröffnen
41+
Review=Überprüfen
3942
Status=Status
4043
Street=Straße
4144
Title=Titel
@@ -45,4 +48,5 @@ Travel=Reise
4548
TravelAgency=Veranstalter
4649
Travels=Reisen
4750
TravelStatus=Reisestatus
51+
Unblock=Entsperren
4852
WebAddress=Web-Adresse

‎_i18n/i18n_en.properties‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
AcceptTravel=Accept Travel
1+
Accept=Accept
22
Agency=Agency
33
AgencyName=Agency Name
44
AvgPrice=Average Price
55
BeginDate=Starting Date
6-
BlockTravel=Block Travel
6+
Block=Block
77
Booking=Booking
88
BookingDate=Booking Date
99
BookingDetails=Booking Details
@@ -36,9 +36,9 @@ Price=Price
3636
Prices=Prices
3737
ProductID=Product
3838
ProductPrice=Product Price
39-
RejectTravel=Reject Travel
40-
ReopenTravel=Reopen Travel
41-
ReviewTravel=Review Travel
39+
Reject=Reject
40+
Reopen=Reopen
41+
Review=Review
4242
Status=Status
4343
Street=Street
4444
Title=Title
@@ -48,5 +48,6 @@ Travel=Travel
4848
TravelAgency=Travel Agency
4949
Travels=Travels
5050
TravelStatus=Travel Status
51-
UnblockTravel=Unblock Travel
51+
Unblock=Unblock Travel
52+
Unblock=Unblock
5253
WebAddress=Web Address

‎_i18n/i18n_fr.properties‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
AcceptTravel=Accepter le voyage
1+
Accept=Accepter
22
Agency=Agence
33
AgencyName=Nom de l''agence
44
AvgPrice=Prix moyen
55
BeginDate=Date de début
6+
Block=Blocker
67
Booking=Réservation
78
BookingDate=Date d''inscription
89
BookingDetails=Les détails de réservation
@@ -36,7 +37,9 @@ Price=Prix
3637
Prices=Prix
3738
ProductID=Produit
3839
ProductPrice=Prix du produit
39-
RejectTravel=Refuser le voyage
40+
Reject=Refuser le voyage
41+
Reopen=Rouvrir
42+
Review=Vérifier
4043
Status=Statut
4144
Street=Rue
4245
Title=Titre
@@ -46,4 +49,5 @@ Travel=Voyage
4649
TravelAgency=Agence de voyage
4750
Travels=Voyages
4851
TravelStatus=Statut du voyage
52+
Unblock=Débloquer
4953
WebAddress=Adresse e-mail

‎app/labels.cds‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ annotate schema.Passengers with @title: '{i18n>Passenger}' {
7777
using { TravelService } from '../srv/travel-service';
7878

7979
annotate TravelService.Travels with actions {
80-
rejectTravel @title: '{i18n>RejectTravel}';
81-
acceptTravel @title: '{i18n>AcceptTravel}';
82-
reopenTravel @title: '{i18n>ReopenTravel}';
80+
rejectTravel @title: '{i18n>Reject}';
81+
acceptTravel @title: '{i18n>Accept}';
82+
reopenTravel @title: '{i18n>Reopen}';
8383
deductDiscount @title: '{i18n>DeductDiscount}';
8484
};
8585

‎app/travels/layouts.cds‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ annotate TravelService.Travels with @UI : {
4747
Criticality : (
4848
Status.code == #Accepted ? 3 :
4949
Status.code == #Open OR Status.code == #InReview ? 2 :
50-
Status.code == #Canceled OR Status.code == #Blocked ? 1 : 0
50+
Status.code == #Rejected OR Status.code == #Blocked ? 1 : 0
5151
),
5252
@UI.Importance : #High,
5353
@HTML5.CssDefaults: {width:'10em'}
@@ -71,7 +71,7 @@ annotate TravelService.Travels with @UI : {
7171
Criticality : (
7272
Status.code == #Accepted ? 3 :
7373
Status.code == #Open OR Status.code == #InReview ? 2 :
74-
Status.code == #Canceled OR Status.code == #Blocked ? 1 : 0
74+
Status.code == #Rejected OR Status.code == #Blocked ? 1 : 0
7575
),
7676
},
7777
{ Value : BeginDate },

‎db/data/sap.capire.travels-TravelStatus.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ O;Open
33
R;InReview
44
B;Blocked
55
A;Accepted
6-
X;Canceled
6+
X;Rejected

‎db/data/sap.capire.travels-TravelStatus.texts.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
code;locale;name
22
O;en;Open
33
A;en;Accepted
4-
X;en;Canceled
4+
X;en;Rejected
55
O;de;Offen
66
A;de;Genehmigt
77
X;de;Abgelehnt

‎db/schema.cds‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ entity TravelStatus : sap.common.CodeList {
7070
InReview = 'R';
7171
Blocked = 'B';
7272
Accepted = 'A';
73-
Canceled = 'X';
73+
Rejected = 'X';
7474
}
7575
}
7676

0 commit comments

Comments
 (0)