From cf94c09e328d0cc0db2e405a9d562d6b2dc2cfb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Kijewski?= Date: Sun, 7 Jul 2024 19:00:00 +0200 Subject: [PATCH] Add French translation --- examples/actix-web-app/src/main.rs | 1 + examples/actix-web-app/templates/404.html | 8 +++---- examples/actix-web-app/templates/_layout.html | 18 ++++++++++++++ examples/actix-web-app/templates/greet.html | 19 +++++++++++---- examples/actix-web-app/templates/index.html | 24 +++++++++++++------ 5 files changed, 54 insertions(+), 16 deletions(-) diff --git a/examples/actix-web-app/src/main.rs b/examples/actix-web-app/src/main.rs index dbf5394e..3598708f 100644 --- a/examples/actix-web-app/src/main.rs +++ b/examples/actix-web-app/src/main.rs @@ -54,6 +54,7 @@ enum Lang { #[default] en, de, + fr, } async fn not_found_handler(req: HttpRequest) -> Result { diff --git a/examples/actix-web-app/templates/404.html b/examples/actix-web-app/templates/404.html index 8e31cf58..344bba26 100644 --- a/examples/actix-web-app/templates/404.html +++ b/examples/actix-web-app/templates/404.html @@ -1,10 +1,10 @@ {% extends "_layout.html" %} -{% block title -%} +{%- block title -%} 404: Not Found -{%- endblock %} +{%- endblock -%} -{% block content -%} +{%- block content -%}

404: Not Found

Back to the first page.

-{%- endblock %} +{%- endblock -%} diff --git a/examples/actix-web-app/templates/_layout.html b/examples/actix-web-app/templates/_layout.html index 5a0d11cd..4f8360c8 100644 --- a/examples/actix-web-app/templates/_layout.html +++ b/examples/actix-web-app/templates/_layout.html @@ -43,6 +43,24 @@ font-size: 80%; width: max-content; margin: 2em 0 0 auto; + display: flex; + flex-direction: row; + flex-wrap: wrap; + } + #lang-select li { + flex-grow: 1; + flex-basis: auto; + margin: .25em 0 0 0; + padding: 0 1em; + text-align: center; + list-style-type: none; + border-left: 0.1rem solid currentColor; + } + #lang-select li:first-of-type { + border-left: 0 none transparent; + } + #lang-select li:last-of-type { + padding-right: 0; } /*]]>*/ diff --git a/examples/actix-web-app/templates/greet.html b/examples/actix-web-app/templates/greet.html index 1ff47f4c..3ae70f05 100644 --- a/examples/actix-web-app/templates/greet.html +++ b/examples/actix-web-app/templates/greet.html @@ -1,17 +1,19 @@ {% extends "_layout.html" %} -{% block title -%} +{%- block title -%} {%- match lang -%} {%- when Lang::en -%} Hello, {{name}}! {%- when Lang::de -%} Hallo, {{name}}! + {%- when Lang::fr -%} Bonjour, {{name}}! {%- endmatch -%} -{%- endblock %} +{%- endblock -%} {%- block content -%}

{%- match lang -%} - {%- when Lang::en -%} Hello - {%- when Lang::de -%} Hallo + {%- when Lang::en -%} Hello! + {%- when Lang::de -%} Hallo! + {%- when Lang::fr -%} Bonjour! {%- endmatch -%}

@@ -22,6 +24,9 @@ {%- when Lang::de -%} Hallo, {{name}}, schön dich kennenzulernen! {#-~#} Ich bin eine Rinja-Beispielanwendung. + {%- when Lang::fr -%} + Bonjour, {{name}}, ravi de vous rencontrer ! {#-~#} + Je suis une application d'exemple de Rinja. {%- endmatch -%}

@@ -29,6 +34,7 @@ {%- match lang -%} {%- when Lang::en -%} Back to the first page. {%- when Lang::de -%} Zurück zur ersten Seite. + {%- when Lang::fr -%} Retour à la première page. {%- endmatch -%}

@@ -40,5 +46,8 @@ {%- if lang != Lang::de -%}
  • Diese Seite auf deutsch.
  • {%- endif -%} + {%- if lang != Lang::fr -%} +
  • Cette page est en français.
  • + {%- endif -%} -{%- endblock %} +{%- endblock -%} diff --git a/examples/actix-web-app/templates/index.html b/examples/actix-web-app/templates/index.html index 65b548a8..3d59830e 100644 --- a/examples/actix-web-app/templates/index.html +++ b/examples/actix-web-app/templates/index.html @@ -1,17 +1,19 @@ {% extends "_layout.html" %} -{% block title -%} +{%- block title -%} {%- match lang -%} - {%- when Lang::en -%} Hello - {%- when Lang::de -%} Hallo + {%- when Lang::en -%} Hello! + {%- when Lang::de -%} Hallo! + {%- when Lang::fr -%} Bonjour! {%- endmatch -%} -{%- endblock %} +{%- endblock -%} {%- block content -%}

    {%- match lang -%} - {%- when Lang::en -%} Hello - {%- when Lang::de -%} Hallo + {%- when Lang::en -%} Hello! + {%- when Lang::de -%} Hallo! + {%- when Lang::fr -%} Bonjour! {%- endmatch -%}

    hallo sagen. {#-~#} Bitte nenne mir doch deinen Namen! + {%- when Lang::fr -%} + Je voudrais vous dire bonjour. {#-~#} + Pourriez-vous me donner votre nom ? {%- endmatch -%}

    @@ -34,6 +39,7 @@ {%- match lang -%} {%- when Lang::en -%} My name is {%- when Lang::de -%} Ich heiße + {%- when Lang::fr -%} Je m'appelle {%- endmatch -%}: @@ -63,5 +70,8 @@ {%- if lang != Lang::de -%}

  • Diese Seite auf deutsch.
  • {%- endif -%} + {%- if lang != Lang::fr -%} +
  • Cette page est en français.
  • + {%- endif -%} -{%- endblock %} +{%- endblock -%}