-
-
Notifications
You must be signed in to change notification settings - Fork 17
feat: add gb #376
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
feat: add gb #376
Changes from all commits
Commits
Show all changes
41 commits
Select commit
Hold shift + click to select a range
2c20435
feat: add gb
lenderom 45cf6f5
feat: add gb
lenderom 0ca7654
fix: add info
lenderom 9a49df8
Merge remote-tracking branch 'origin/main' into feat/add-gb
lenderom ee3f2bb
fix: save gb
lenderom 6440ba6
Merge branch 'feat/add-gb' of github.com:fipguide/fipguide.github.io …
lenderom 295913b
fix: save
lenderom 37424f1
Merge remote-tracking branch 'origin/main' into feat/add-gb
lenderom e7a6f5f
fix: update uk
lenderom 8afdecf
Delete assets/images/flags/greatbritain.webp
lenderom 656608a
fix: update uk info
lenderom c915afa
Merge branch 'main' into feat/add-gb
lenderom 376bccd
fix: add images
lenderom ca8f72c
fix: update FIP information for Northern Ireland and National Rail su…
lenderom 819961e
grammar and spelling corrections
therobrob bed7a1b
grammar and spelling corrections
therobrob 617570f
grammar and spelling corrections
therobrob d3d1c1a
Merge remote-tracking branch 'origin/feat/add-gb' into feat/add-gb
therobrob f516dc4
fix: realize feedback
lenderom 10bcd5a
grammar and spelling corrections
therobrob 5d5c055
Merge branch 'feat/add-gb' of github.com:fipguide/fipguide.github.io …
lenderom bb62f6c
Merge branch 'feat/add-gb' of github.com:fipguide/fipguide.github.io …
lenderom 17a8a49
grammar and spelling corrections
therobrob 4868c4b
Apply suggestion from @clemens773
lenderom bc242a9
Update content/country/united_kingdom/index.de.md
lenderom d269916
Update content/country/united_kingdom/index.de.md
lenderom 713fea9
Update content/country/united_kingdom/index.de.md
lenderom 269ba76
Update content/operator/gb/index.de.md
lenderom 37e787c
Update content/country/united_kingdom/index.de.md
lenderom 45eeab9
Update FIP conditions for France and the United Kingdom: add Getlink …
lenderom 6366f32
Merge branch 'feat/add-gb' of github.com:fipguide/fipguide.github.io …
lenderom a3cba79
Fix spelling of "Le Shuttle" to "LeShuttle" in French, English, and G…
lenderom d02a6ba
fix: update content from feedback
lenderom 12afea9
Merge remote-tracking branch 'origin/main' into feat/add-gb
MoritzWeber0 2eca808
fix: Grammar & spelling errors
MoritzWeber0 5e9a09e
Update content/operator/gb/index.de.md
lenderom 6203a39
feat: Add source for Caledonian arrival rule
MoritzWeber0 830a064
fix: rename to united-kingdom
lenderom a462421
Merge branch 'main' into feat/add-gb
lenderom 92d2425
Reviewed UK and did some changes
Willy102 aeda4d1
fix: add translations
lenderom File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+19.6 KB
content/booking/caledonian-sleeper-website/caledonian_sleeper_reservation.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| --- | ||
| draft: false | ||
| title: "Caledonian Sleeper Website" | ||
| description: "Buchungsinformationen für die Caledonian Sleeper Website." | ||
| params: | ||
| fip_50: false | ||
| reservations: true | ||
| booking_link: "https://www.sleeper.scot/" | ||
| additional_info_link: "https://www.sleeper.scot/help-support/room-supplements/" | ||
| type: "website" | ||
| --- | ||
|
|
||
| {{% booking-section "reservations" %}} | ||
|
|
||
| ## Reservierungen | ||
|
|
||
| Auf der Website des Caledonian Sleeper können Room Supplements (Reservierungen mit Aufschlägen für Schlafwagen) erworben werden. Zusätzlich zur Reservierung ist ein gültiger FIP Freifahrtschein für National Rail für den Tag der Ankunft erforderlich. Dazu muss bei der Verbindungssuche die Option _Room Supplement only_ ausgewählt sein. | ||
|
|
||
|  | ||
| {{% /booking-section %}} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| --- | ||
| draft: false | ||
| title: "Caledonian Sleeper Website" | ||
| description: "Booking information for the Caledonian Sleeper website." | ||
| params: | ||
| fip_50: false | ||
| reservations: true | ||
| booking_link: "https://www.sleeper.scot/" | ||
| additional_info_link: "https://www.sleeper.scot/help-support/room-supplements/" | ||
| type: "website" | ||
| --- | ||
|
|
||
| {{% booking-section "reservations" %}} | ||
|
|
||
| ## Reservations | ||
|
|
||
| On the Caledonian Sleeper website, you can purchase Room Supplements (reservations with surcharges for sleeper cars). In addition to the reservation, a valid FIP Coupon for National Rail is required for the day of arrival. When searching for connections, make sure to select the _Room Supplement only_ option. | ||
|
|
||
|  | ||
| {{% /booking-section %}} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| --- | ||
| draft: false | ||
| title: "Site Web Caledonian Sleeper" | ||
| description: "Informations de réservation pour le site web Caledonian Sleeper." | ||
| params: | ||
| fip_50: false | ||
| reservations: true | ||
| booking_link: "https://www.sleeper.scot/" | ||
| additional_info_link: "https://www.sleeper.scot/help-support/room-supplements/" | ||
| type: "website" | ||
| --- | ||
|
|
||
| {{% booking-section "reservations" %}} | ||
|
|
||
| ## Réservations | ||
|
|
||
| Sur le site web du Caledonian Sleeper, il est possible d’acheter des suppléments de chambre (réservations avec suppléments pour les voitures-lits). En plus de la réservation, un Coupon FIP valable pour National Rail est requis pour le jour d’arrivée. Lors de la recherche de correspondances, il faut sélectionner l’option _Room Supplement only_. | ||
|
|
||
|  | ||
| {{% /booking-section %}} |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| --- | ||
| draft: false | ||
| title: "GWR Website" | ||
| description: "Buchungsinformationen für die Great Western Railway (GWR) Website." | ||
| params: | ||
| classes: | ||
| first: "kostenlos" | ||
| second: "kostenlos" | ||
| fip_50: false | ||
| reservations: true | ||
| booking_link: "https://www.gwr.com/" | ||
| additional_info_link: "https://www.gwr.com/your-tickets/seat-reservations" | ||
| type: "website" | ||
| --- | ||
|
|
||
| {{% booking-section "reservations" %}} | ||
|
|
||
| ## Reservierungen | ||
|
|
||
| Auf der Website von GWR können kostenlose Sitzplatzreservierungen für alle nationalen Zugverbindungen, bei denen Reservierungen möglich sind, vorgenommen werden. | ||
|
|
||
| Um einen Sitzplatz zu reservieren, muss ein Nutzerkonto angelegt werden. Nach erfolgreicher Anmeldung kann im Menü im Bereich _Bookings_ über den Button _Make a seat/bike reservation_ eine Verbindung ausgesucht und reserviert werden. Bei der Ticketauswahl lässt sich ein beliebiges Ticket entsprechend der gewünschten Klasse wählen. | ||
|  | ||
| {{% /booking-section %}} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| --- | ||
| draft: false | ||
lenderom marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| title: "GWR Website" | ||
| description: "Booking information for the Great Western Railway (GWR) website." | ||
| params: | ||
| classes: | ||
| first: "free" | ||
| second: "free" | ||
| fip_50: false | ||
| reservations: true | ||
| booking_link: "https://www.gwr.com/" | ||
| additional_info_link: "https://www.gwr.com/your-tickets/seat-reservations" | ||
| type: "website" | ||
| --- | ||
|
|
||
| {{% booking-section "reservations" %}} | ||
|
|
||
| ## Reservations | ||
|
|
||
| On the GWR website, you can make free seat reservations for all national train connections where reservations are possible. | ||
|
|
||
| To reserve a seat, you must create a user account. After successful login, you can select a connection and reserve it via the _Bookings_ menu using the _Make a seat/bike reservation_ button. When choosing a ticket, you can select any ticket according to the desired class. | ||
|  | ||
| {{% /booking-section %}} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| --- | ||
| draft: false | ||
| title: "Site Web GWR" | ||
| description: "Informations de réservation pour le site web Great Western Railway (GWR)." | ||
| params: | ||
| classes: | ||
| first: "gratuit" | ||
| second: "gratuit" | ||
| fip_50: false | ||
| reservations: true | ||
| booking_link: "https://www.gwr.com/" | ||
| additional_info_link: "https://www.gwr.com/your-tickets/seat-reservations" | ||
| type: "website" | ||
| --- | ||
|
|
||
| {{% booking-section "reservations" %}} | ||
|
|
||
| ## Réservations | ||
|
|
||
| Sur le site web de GWR, il est possible de réserver gratuitement des places assises pour toutes les liaisons nationales où la réservation est possible. | ||
|
|
||
| Pour réserver une place, il faut créer un compte utilisateur. Après connexion, vous pouvez choisir une liaison et la réserver via le menu _Bookings_ en utilisant le bouton _Make a seat/bike reservation_. Lors du choix du billet, il est possible de sélectionner n’importe quel billet selon la classe souhaitée. | ||
|  | ||
| {{% /booking-section %}} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,7 @@ description: "Buchungsinformationen für die Buchung per E-Mail bei Internationa | |
|
|
||
| params: | ||
| fip_global_fare: true | ||
| fip_50: true | ||
| type: "email" | ||
| fee: 10£ | ||
|
|
||
|
|
@@ -13,14 +14,26 @@ aliases: | |
| - uk-mail | ||
| --- | ||
|
|
||
| {{% booking-section "fip_global_fare" %}} | ||
|
|
||
| ## FIP Globalpreis | ||
therobrob marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| Über International Rail Ltd. können FIP Globalpreistickets erworben werden. Dazu muss eine Mail an [[email protected]](mailto:[email protected]) gesendet werden. Die Buchung ist nur in Englisch möglich. Bei der Buchung müssen folgende Angaben gemacht werden: | ||
|
|
||
| {{% /booking-section %}} | ||
|
|
||
| {{% booking-section "fip_50" %}} | ||
|
|
||
| ## FIP 50 Fahrkarten | ||
|
|
||
| Über International Rail Ltd. können FIP 50 Fahrkarten erworben werden. Dazu muss eine Mail an [[email protected]](mailto:[email protected]) gesendet werden. Die Buchung ist nur auf Englisch möglich. Bei der Buchung müssen folgende Angaben gemacht werden: | ||
|
|
||
| - Reisetag und Zeit | ||
| - Abfahrts- und Zielbahnhof | ||
| - Anzahl der Fahrgäste | ||
| - Reiseklasse (analog Berechtigung des FIP-Ausweises) | ||
| - Foto des FIP Ausweises aller reisender Personen | ||
|
|
||
| {{% /booking-section %}} | ||
|
|
||
| **Pro Buchung wird eine Buchungsgebühr von 10£ erhoben.** | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,39 @@ | ||
| --- | ||
| draft: false | ||
| title: "International Rail Ltd. Email" | ||
| description: "Booking information for email bookings with International Rail Ltd." | ||
| description: "Booking information for booking by email with International Rail Ltd." | ||
|
|
||
| params: | ||
| fip_global_fare: true | ||
| fip_50: true | ||
| type: "email" | ||
| fee: £10 | ||
|
|
||
| aliases: | ||
| - uk_mail | ||
| - uk-mail | ||
| --- | ||
|
|
||
| {{% booking-section "fip_global_fare" %}} | ||
|
|
||
| ## FIP Global Fare | ||
|
|
||
| FIP Global Fare tickets can be purchased through International Rail Ltd. To do so, send an email to [[email protected]](mailto:[email protected]). Bookings can only be made in English. Please include the following information in your booking request: | ||
| FIP Global Fare tickets can be purchased via International Rail Ltd. To do so, send an email to [[email protected]](mailto:[email protected]). Booking is only possible in English. The following information must be provided when booking: | ||
|
|
||
| {{% /booking-section %}} | ||
|
|
||
| {{% booking-section "fip_50" %}} | ||
|
|
||
| ## FIP 50 Tickets | ||
|
|
||
| FIP 50 tickets can be purchased via International Rail Ltd. To do so, send an email to [[email protected]](mailto:[email protected]). Booking is only possible in English. The following information must be provided when booking: | ||
|
|
||
| - Date and time of travel | ||
| - Departure and destination stations | ||
| - Departure and destination station | ||
| - Number of passengers | ||
| - Class of travel (according to your FIP Card entitlement) | ||
| - Class of travel (according to FIP Card entitlement) | ||
| - Photo of the FIP Card for all traveling persons | ||
|
|
||
| {{% /booking-section %}} | ||
|
|
||
| **A booking fee of £10 is charged per booking.** |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,39 @@ | ||
| --- | ||
| draft: false | ||
| title: "E-mail International Rail Ltd." | ||
| description: "Informations sur la réservation par e-mail auprès d’International Rail Ltd." | ||
| description: "Informations de réservation pour la réservation par e-mail auprès d’International Rail Ltd." | ||
|
|
||
| params: | ||
| fip_global_fare: true | ||
| fip_50: true | ||
| type: "email" | ||
| fee: 10£ | ||
|
|
||
| aliases: | ||
| - uk_mail | ||
| - uk-mail | ||
| --- | ||
|
|
||
| {{% booking-section "fip_global_fare" %}} | ||
|
|
||
| ## Tarif Global FIP | ||
|
|
||
| Les billets au Tarif Global FIP peuvent être achetés via International Rail Ltd. Pour cela, envoyez un e-mail à [[email protected]](mailto:[email protected]). Les réservations se font uniquement en anglais. Veuillez inclure les informations suivantes dans votre demande : | ||
| Les billets au tarif global FIP peuvent être achetés auprès d’International Rail Ltd. Pour cela, il faut envoyer un e-mail à [[email protected]](mailto:[email protected]). La réservation n’est possible qu’en anglais. Les informations suivantes doivent être fournies lors de la réservation : | ||
|
|
||
| {{% /booking-section %}} | ||
|
|
||
| {{% booking-section "fip_50" %}} | ||
|
|
||
| ## Billets FIP 50 | ||
|
|
||
| Les billets FIP 50 peuvent être achetés auprès d’International Rail Ltd. Pour cela, il faut envoyer un e-mail à [[email protected]](mailto:[email protected]). La réservation n’est possible qu’en anglais. Les informations suivantes doivent être fournies lors de la réservation : | ||
|
|
||
| - Date et heure du voyage | ||
| - Gare de départ et de destination | ||
| - Nombre de voyageurs | ||
| - Classe de voyage (selon le droit de la Carte FIP) | ||
| - Photo de la Carte FIP de chaque voyageur | ||
|
|
||
| - Date et heure de voyage | ||
| - Gare de départ et gare de destination | ||
| - Nombre de passagers | ||
| - Classe de voyage (selon les droits indiqués sur votre Carte FIP) | ||
| - Photo de la Carte FIP pour chaque personne voyageant | ||
| {{% /booking-section %}} | ||
|
|
||
| **Des frais de réservation de 10£ sont appliqués par commande.** | ||
| **Des frais de réservation de 10£ sont facturés par réservation.** |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| --- | ||
| draft: false | ||
| title: "National Rail Ticketschalter" | ||
| description: "Buchungsinformationen für die National Rail Ticketschalter." | ||
|
|
||
| params: | ||
| classes: | ||
| first: "kostenlos" | ||
| second: "kostenlos" | ||
| fip_50: true | ||
| reservations: true | ||
| additional_info_link: "https://www.nationalrail.co.uk/stations/" | ||
| type: "onsite" | ||
| --- | ||
|
|
||
| Die Ticketschalter in Großbritannien werden in der Regel vom jeweiligen Bahnbetreiber des Bahnhofs betrieben. Dennoch verkaufen die verschiedenen Betreiber auch Fahrkarten und Reservierungen für die Züge anderer Bahngesellschaften im Land. | ||
| {{% booking-section "fip_50" %}} | ||
|
|
||
| ## FIP 50 Fahrkarten | ||
|
|
||
| An den Ticketschaltern werden Fahrkarten mit FIP 50 Rabatt verkauft. Dazu muss der FIP Ausweis vorgelegt werden. | ||
| {{% /booking-section %}} | ||
|
|
||
| {{% booking-section "reservations" %}} | ||
|
|
||
| ## Reservierungen | ||
|
|
||
| Kostenlose Sitzplatzreservierungen können am Ticketschalter vorgenommen werden. Meist genügt hierfür der Verweis auf einen FIP Freifahrtschein. Ein Ticket muss in der Regel nicht vorgelegt werden. | ||
| {{% /booking-section %}} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| --- | ||
| draft: false | ||
| title: "National Rail Ticket Office" | ||
| description: "Booking information for National Rail ticket offices." | ||
|
|
||
| params: | ||
| classes: | ||
| first: "free" | ||
| second: "free" | ||
| fip_50: true | ||
| reservations: true | ||
| additional_info_link: "https://www.nationalrail.co.uk/stations/" | ||
| type: "onsite" | ||
| --- | ||
|
|
||
| Ticket offices in Great Britain are usually operated by the respective train company of the station. However, the different operators also sell tickets and reservations for trains of other railway companies in the country. | ||
| {{% booking-section "fip_50" %}} | ||
|
|
||
| ## FIP 50 Tickets | ||
|
|
||
| Tickets with FIP 50 discount are sold at ticket offices. The FIP Card must be presented. | ||
| {{% /booking-section %}} | ||
|
|
||
| {{% booking-section "reservations" %}} | ||
|
|
||
| ## Reservations | ||
|
|
||
| Free seat reservations can be made at the ticket office. Usually, it is sufficient to mention a FIP Coupon. A ticket does not usually need to be presented. | ||
| {{% /booking-section %}} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.