From c3aaf4ad57f427c3bec6f7a7da5324ed2409be63 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 29 May 2017 11:25:07 +0200 Subject: [PATCH] Add missing translation messages --- app/Resources/translations/messages.en.yml | 32 ++++++++++++++++++- .../views/brickset/description.html.twig | 2 +- app/Resources/views/brickset/images.html.twig | 2 +- .../views/brickset/instructions.html.twig | 2 +- .../views/brickset/reviews.html.twig | 2 +- app/Resources/views/macros/blocks.html.twig | 20 ++++++++---- app/Resources/views/model/index.html.twig | 2 +- app/Resources/views/set/index.html.twig | 2 +- 8 files changed, 50 insertions(+), 14 deletions(-) diff --git a/app/Resources/translations/messages.en.yml b/app/Resources/translations/messages.en.yml index 4608f11..0bcde23 100644 --- a/app/Resources/translations/messages.en.yml +++ b/app/Resources/translations/messages.en.yml @@ -97,4 +97,34 @@ view.all: flash: warning.title: Warning - error.title: Error \ No newline at end of file + error.title: Error + +empty: + description: + title: No description + message: Sorry, no desctiption found on Brickset + instructions: + title: No instructions + message: Sorry, no instructions found on Brickset + images: + title: No images + message: Sorry, no images found on Brickset + reviews: + title: No reviews + message: Sorry, no reviews found on Brickset + models: + search.title: No results found for your search criteria + +page.error: + title: + large: + text: + +part: + id: ID + name: Name + category: Category + model: Model + alternates: Alternate parts + molds: Molds of part + prints: Prints diff --git a/app/Resources/views/brickset/description.html.twig b/app/Resources/views/brickset/description.html.twig index c39a774..71efc07 100644 --- a/app/Resources/views/brickset/description.html.twig +++ b/app/Resources/views/brickset/description.html.twig @@ -16,6 +16,6 @@

{{ 'set.brickset.credit' | trans | raw }}

{% else %} - {{ blocks.empty('empty.description'|trans) }} + {{ blocks.empty('empty.description.title'|trans, 'empty.description.message'|trans) }} {% endif %} {% endblock %} \ No newline at end of file diff --git a/app/Resources/views/brickset/images.html.twig b/app/Resources/views/brickset/images.html.twig index 34fe58b..fe543b2 100644 --- a/app/Resources/views/brickset/images.html.twig +++ b/app/Resources/views/brickset/images.html.twig @@ -24,6 +24,6 @@

{{ 'set.brickset.credit' | trans | raw }}

{% else %} - {{ blocks.empty('empty.images') }} + {{ blocks.empty('empty.images.title'|trans, 'empty.images.message'|trans) }} {% endif %} {% endblock %} \ No newline at end of file diff --git a/app/Resources/views/brickset/instructions.html.twig b/app/Resources/views/brickset/instructions.html.twig index 45ddb14..1f78198 100644 --- a/app/Resources/views/brickset/instructions.html.twig +++ b/app/Resources/views/brickset/instructions.html.twig @@ -35,6 +35,6 @@

{{ 'set.brickset.credit' | trans | raw }}

{% else %} - {{ blocks.empty('empty.instructions') }} + {{ blocks.empty('empty.instructions.title'|trans, 'empty.instructions.message'|trans) }} {% endif %} {% endblock %} \ No newline at end of file diff --git a/app/Resources/views/brickset/reviews.html.twig b/app/Resources/views/brickset/reviews.html.twig index 60edf13..bfc6a57 100644 --- a/app/Resources/views/brickset/reviews.html.twig +++ b/app/Resources/views/brickset/reviews.html.twig @@ -72,6 +72,6 @@

{{ 'set.brickset.credit' | trans | raw }}

{% else %} - {{ blocks.empty('empty.reviews') }} + {{ blocks.empty('empty.reviews.title'|trans, 'empty.reviews.message'|trans) }} {% endif %} {% endblock %} \ No newline at end of file diff --git a/app/Resources/views/macros/blocks.html.twig b/app/Resources/views/macros/blocks.html.twig index 06e3111..cd6e3de 100644 --- a/app/Resources/views/macros/blocks.html.twig +++ b/app/Resources/views/macros/blocks.html.twig @@ -80,18 +80,24 @@ {% if quantity %} -
-
{{ quantity }}x
-
+
+
{{ quantity }}x
+
{% endif %} {% endmacro %} -{% macro empty(message) %} -
-

{{ message }}

-
+{% macro empty(title, message = null) %} +

+ +
+ {{ title }} + {% if message %} +
{{ message }}
+ {% endif %} +
+

{% endmacro %} {% macro ccal2_license(title,author) %} diff --git a/app/Resources/views/model/index.html.twig b/app/Resources/views/model/index.html.twig index a74a840..034b0ed 100644 --- a/app/Resources/views/model/index.html.twig +++ b/app/Resources/views/model/index.html.twig @@ -37,7 +37,7 @@ {% for model in models %} {{ blocks.model(model) }} {% else %} - {{ blocks.empty('empty.models') }} + {{ blocks.empty('empty.search.title' | trans )}} {% endfor %} diff --git a/app/Resources/views/set/index.html.twig b/app/Resources/views/set/index.html.twig index 191c027..a40811b 100644 --- a/app/Resources/views/set/index.html.twig +++ b/app/Resources/views/set/index.html.twig @@ -47,7 +47,7 @@ {% for set in sets %} {{ blocks.set(set) }} {% else %} - {{ blocks.empty('empty.sets') }} + {{ blocks.empty('empty.search.title' | trans ) }} {% endfor %}