From 336ff7b10334cfa7d9c57799ba6d71b53c1f821d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Tue, 26 Feb 2019 14:02:05 +0100 Subject: [PATCH] Use keys for translations, and added translations, --- config/packages/translation.yaml | 1 + config/services.yaml | 2 +- templates/base.html.twig | 120 ++++---- templates/show_part_info.html.twig | 50 ++-- templates/show_part_info_classic.html.twig | 329 --------------------- translations/messages.de.xlf | 312 ++++++++----------- translations/messages.en.xlf | 220 ++++++++++++++ 7 files changed, 431 insertions(+), 603 deletions(-) delete mode 100644 templates/show_part_info_classic.html.twig diff --git a/config/packages/translation.yaml b/config/packages/translation.yaml index e6b1cd66..81fb0c36 100644 --- a/config/packages/translation.yaml +++ b/config/packages/translation.yaml @@ -4,3 +4,4 @@ framework: default_path: '%kernel.project_dir%/translations' fallbacks: - '%locale%' + - 'en' diff --git a/config/services.yaml b/config/services.yaml index 10bca7de..9fcb4caf 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -4,7 +4,7 @@ # Put parameters here that don't need to change on each machine where the app is deployed # https://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration parameters: - locale: 'en' + locale: 'de' services: # default configuration for services in *this* file diff --git a/templates/base.html.twig b/templates/base.html.twig index 4538746b..0bfe10ef 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -16,7 +16,7 @@ @@ -227,7 +227,7 @@ {if !empty($reload_link)}
- + {/if} diff --git a/templates/show_part_info.html.twig b/templates/show_part_info.html.twig index d4820c55..0fd69b45 100644 --- a/templates/show_part_info.html.twig +++ b/templates/show_part_info.html.twig @@ -1,16 +1,16 @@ {% extends "base.html.twig" %} {% block title %} - {% trans %}Detail info for{% endtrans %} {{ part.name }} + {% trans %}part.info.title{% endtrans %} {{ part.name }} {% endblock %} {% block content %}
- {% trans %}Detail info for{% endtrans %} "{{ part.name }}" + {% trans %}part.info.title{% endtrans %} "{{ part.name }}"
- {% trans %}ID:{% endtrans %} {{ part.id }} + {% trans %}id.label{% endtrans %}: {{ part.id }}
@@ -22,30 +22,30 @@
-
{{ part.manufacturer.name ?? ""}}
+
{{ part.manufacturer.name ?? ""}}

{{ part.name }}

-
{{ part.description }}
-
+
{{ part.description }}
+
{{ part.storelocation.fullPath ?? "-"}}
- {{ part.instock }} + {{ part.instock }} / - {{ part.mininstock }} + {{ part.mininstock }}
-
+
{{ part.footprint.fullPath ?? "-"}}
-
+
{{ "TODO" }}
{% if part.comment != "" %} -
+
{{ part.comment }}
@@ -59,25 +59,25 @@ - {% trans %}Attachments{% endtrans %} + {% trans %}attachment.labelp{% endtrans %}
  • - {% trans %}Shopping Informations{% endtrans %} + {% trans %}vendor.partinfo.shopping_infos{% endtrans %}
  • - {% trans %}History{% endtrans %} + {% trans %}vendor.partinfo.history{% endtrans %}
  • - {% trans %}Tools{% endtrans %} + {% trans %}tools.label{% endtrans %}
    • @@ -94,8 +94,8 @@
    - - + +
    @@ -110,17 +110,17 @@
    - +
    - +
    - +
    @@ -138,17 +138,17 @@
    - +
    - +
    - +
    @@ -197,7 +197,7 @@

    - +

    {{ part.datetimeAdded | date}} {#{if !empty($creation_user)} {% trans %}by{% endtrans %} {if $can_visit_user} @@ -212,7 +212,7 @@

    - +

    {{ part.lastModified | date }} {# {if !empty($last_modified_user)} {% trans %}by{% endtrans %} {if $can_visit_user} diff --git a/templates/show_part_info_classic.html.twig b/templates/show_part_info_classic.html.twig deleted file mode 100644 index eccbb064..00000000 --- a/templates/show_part_info_classic.html.twig +++ /dev/null @@ -1,329 +0,0 @@ -{% extends "base.html.twig" %} - -{% block content %} -

    -
    - - {% trans %}Detail info for{% endtrans %} "{{ part.name }}" -
    - {% trans %}ID:{% endtrans %} {{ part.id }} -
    -
    - -
    -
    -
    - {# -
    -
    - -
    - {% if part.manufacturerProductUrl %} - {{part.name}} - {% else %} -

    {{ part.name }}

    - {% endif %} -
    -
    - -
    - -
    -

    - {% if part.description %}{{part.description}}{% else %}-{% endif %} -

    -
    -
    - -
    - -
    -

    {{ part.instock }}

    -
    -
    - -
    - -

    {{ part.mininstock}}

    -
    - -
    - - {# -
    {* {$category_full_path}*} - {include "../smarty_structural_link.tpl" link=$category_path} -
    - -
    TODO: {{ part.category.fullPath }}
    -
    - -
    - -
    - {# {include "../smarty_structural_link.tpl" link=$storelocation_path} - TODO: {{ part.storelocation.fullPath }} -
    -
    - - {if !$disable_manufacturers} -
    - -
    - {include "../smarty_structural_link.tpl" link=$manufacturer_path} -
    -
    - {/if} - - {if !$disable_footprints} -
    - -
    - {include "../smarty_structural_link.tpl" link=$footprint_path} -
    -
    - - {if !empty($footprint_filename) && $footprint_valid} -
    -
    - -
    -
    - {/if} - - {if $foot3d_active && !empty($foot3d_filename) && $foot3d_valid} -
    -
    - - - - - - - - - -
    -
    - {/if} - - {/if} - -
    - -
    -

    {if !empty($comment)}{$comment nofilter}{else}-{/if}

    -
    -
    - - {if $can_edit} -
    -
    - - {% trans %}Angaben verändern{% endtrans %} -
    -
    - {/if} -
    - - #} - -
    -
    - -
    -
    -
    Hersteller
    -

    {{ part.name }}

    -
    -
    - -
    - -
    - -
    - -
    -
    - -
    - -
    -
    - - -
    -
    -
    - - -
    -
    -
    -
    -
    -
    -
    -
    -
    - -

    - -
    - -
    -
    - -
    - -
    -
    - - -
    -
    -
    - - -
    -
    -
    -
    -
    -
    -
    -
    -
    - -

    - - {if $can_order_read && !$instock_unknown} -
    - -
    -
    - {if $manual_order_exists} - - - {else} - {if $auto_order_exists} - {% trans %}Das Bauteil wird unter "Zu bestellende Teile"aufgelistet, da der Bestand kleiner als der Mindestbestand ist.{% endtrans %} - {else} - -
    -
    - - - -
    - {/if} - {/if} -
    -
    -
    - {/if} - -

    - -
    - -

    {$datetime_added} - {if !empty($creation_user)} {% trans %}durch{% endtrans %} - {if $can_visit_user} - {$creation_user} - {else} - {$creation_user} - {/if} - {/if} -

    -
    - -

    - -
    - -

    {$last_modified} - {if !empty($last_modified_user)} {% trans %}durch{% endtrans %} - {if $can_visit_user} - {$last_modified_user} - {else} - {$last_modified_user} - {/if} - {/if} -

    -
    - -

    - -
    - {if $can_generate_barcode} - {if count($barcode_profiles) > 0} - - - -
    - - - - - -
    - {else} - - - - - - - {/if} -
    - -

    - {/if} - -
    - -
    - -

    - -
    -
    - - -
    -
    -
    -
    - -
    - -
    -{% endblock %} \ No newline at end of file diff --git a/translations/messages.de.xlf b/translations/messages.de.xlf index 9d3f2a09..0c4ce004 100644 --- a/translations/messages.de.xlf +++ b/translations/messages.de.xlf @@ -5,273 +5,209 @@ - - Toggle Sidebar - __Toggle Sidebar + + sidebar.toggle + Sidebar umschalten - - Search options - __Search options + + search.options.label + Suchoptionen - - Name + + name.label Name - - Category + + category.label Kategorie - - Description + + description.label Beschreibung - - Storelocation + + storelocation.label Lagerort - - Comment + + comment.label Kommentar - - Ordernr. - Bestellnr. + + ordernumber.label.short + Ordernr. - - Supplier + + supplier.label Lieferant - - Manufacturer + + manufacturer.label Hersteller - - Footprint - Footprint + + footprint.label + __footprint.label - - Deact. Barcode + + search.deactivateBarcode Deakt. Barcode - - RegEx Matching - RegEx Matching + + search.regexmatching + Reg.Ex. Matching - - Suche + + search.placeholder Suche - - Go! + + go.exclamation Los! - - Scan Barcode + + barcode.scan Scanne Barcode - - Logged in as + + user.loggedin.label Eingeloggt als - - User settings + + user.settings.label Benutzereinstellungen - - User informations + + user.info.label Benutzerinformationen - - Logout - Logout + + user.logout + Ausloggen - - Login - __Login + + user.login + Einloggen - - Categories + + category.labelp Kategorien - - Actions + + actions Aktionen - - Expand All + + expandAll Alle ausklappen - - Reduce All + + reduceAll Alle einklappen - - Datasource + + datasource Datenquelle - - Store locations - Lagerort + + storelocation.labelp + Lagerorte - - Footprints + + footprint.labelp Footprints - - Manufacturers + + manufacturer.labelp Hersteller - - Suppliers - Lieferanten + + supplier.labelp + Anbieter - - Devices - Baugruppe + + device.labelp + Baugruppen - - Tools + + tools.label Tools - - Please activate Javascript to use all features. - Bitte aktivieren sie Javascript um alle Funktionen zu nutzen! + + vendor.base.javascript_hint + Aktivieren Sie Javascript um alle Features zu nutzen! - - Detail info for + + part.info.title Detailinfo für - - ID: - ID: + + id.label + ID - - Store location - Lagerort + + instock.label + Im Lager - - Instock - Vorhandene Teile + + mininstock.label + Mindestanzahl - - Minimum Instock - Mindesanzahl an Lagerbestand - - - Average price + + part.avg_price.label Durchschnittspreis - - Attachments + + attachment.labelp Dateianhänge - - Shopping Informations + + vendor.partinfo.shopping_infos Einkaufsinformationen - - History + + vendor.partinfo.history Historie - - Delete part: - Bauteil löschen: - - - Delete part + + part.delete.caption Bauteil löschen - - Withdraw parts: - Teile entnehmen: + + part.delete.btn + Bauteil löschen - - Withdraw + + part.withdraw.caption: + Bauteile entnehmen: + + + part.withdraw.btn Entnehmen - - Comment/Purpose: - Kommentar + + part.withdraw.comment: + Kommentar/Zweck - - Add parts: - Teile hinzufügen + + part.add.caption + Bauteil hinzufügen - - Add + + part.add.btn Hinzufügen - - Created at: - Hinzugefügt am: + + part.add.comment + Kommentar/Zweck - - Last modified: - Zuletzt bearbeitet: + + createdAt + Erstellt am - - Teile entnehmen: - __Teile entnehmen: - - - Entnehmen - __Entnehmen - - - Kommentar/Zweck: - __Kommentar/Zweck: - - - Teile hinzufügen - __Teile hinzufügen - - - Hinzufügen - __Hinzufügen - - - Bauteil wurde manuell zum Bestellen vorgemerkt. - __Bauteil wurde manuell zum Bestellen vorgemerkt. - - - Aufheben - __Aufheben - - - Das Bauteil wird unter "Zu bestellende Teile"aufgelistet, da der Bestand kleiner als der Mindestbestand ist. - __Das Bauteil wird unter "Zu bestellende Teile"aufgelistet, da der Bestand kleiner als der Mindestbestand ist. - - - Zum Bestellen vormerken: - __Zum Bestellen vormerken: - - - Übernehmen - __Übernehmen - - - Hinzugefügt: - __Hinzugefügt: - - - durch - __durch - - - Letzte Änderung: - __Letzte Änderung: - - - Barcode erzeugen - __Barcode erzeugen - - - Übersicht drucken - __Übersicht drucken - - - Datenblattlinks - __Datenblattlinks + + lastModified + Zuletzt bearbeitet diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf index f0e53b01..9a01ec3f 100644 --- a/translations/messages.en.xlf +++ b/translations/messages.en.xlf @@ -273,6 +273,226 @@ Datenblattlinks __Datenblattlinks + + sidebar.toggle + Toggle Sidebar + + + search.options.label + Search options + + + name.label + Name + + + category.label + Category + + + description.label + Description + + + storelocation.label + Store location + + + comment.label + Comment + + + ordernumber.label.short + Ordernr. + + + supplier.label + Supplier + + + manufacturer.label + Manufacturer + + + footprint.label + Footprint + + + search.deactivateBarcode + Deact. Barcode + + + search.regexmatching + Reg.Ex. Matching + + + go.exclamation + Go! + + + barcode.scan + Scan Barcode + + + user.loggedin.label + Logged in as + + + user.settings.label + User settings + + + user.info.label + User informations + + + user.logout + Logout + + + user.login + Login + + + categories.label + + + + actions + Actions + + + expandAll + Expand All + + + reduceAll + Reduce All + + + datasource + Datasource + + + category.labelp + Categories + + + storelocation.labelp + Storelocations + + + footprint.labelp + Footprints + + + manufacturer.labelp + Manufacturers + + + supplier.labelp + Suppliers + + + device.labelp + Devices + + + tools.label + Tools + + + expandall + __expandall + + + reduceall + __reduceall + + + tools.labelp + __tools.labelp + + + vendor.base.javascript_hint + Please activate Javascript to use all features! + + + part.info.title + Detail info for part + + + id.label + ID + + + instock.label + Instock + + + mininstock.label + Minimum Instock + + + part.avg_price.label + Average Price + + + attachment.labelp + Attachments + + + vendor.partinfo.shopping_infos + Shopping informations + + + vendor.partinfo.history + History + + + part.delete.caption + Delete Part + + + part.delete.btn + Delete Part + + + part.withdraw.caption: + Withdraw parts: + + + part.withdraw.btn + Withdraw + + + part.withdraw.comment: + Comment/Purpose + + + part.add.caption + Add parts + + + part.add.btn + Add + + + part.add.comment + Comment/Purpose + + + createdAt + Created At + + + lastModified + Last modified + + + search.placeholder + Search +