Merge branch '2692-add_advanced_search_engine2' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2

2021-01-28 16:10:23 +01:00 · 2021-01-28 16:10:23 +01:00 · 69e8dfc334
parent 797f96f4c8 5ea222dc00
commit 69e8dfc334
3 changed files with 4 additions and 3 deletions
--- a/modules/route/front/search-panel/index.html
+++ b/modules/route/front/search-panel/index.html
@ -43,7 +43,7 @@
                    ng-model="filter.to"
                    on-change="$ctrl.to = value">
                </vn-date-picker>
-                <vn-none class="or vn-px-md">O</vn-none>
+                <vn-none class="or vn-px-md" translate>Or</vn-none>
                <vn-input-number
                    vn-one
                    min="0"
--- a/modules/ticket/front/search-panel/index.html
+++ b/modules/ticket/front/search-panel/index.html
@ -35,7 +35,7 @@
                    ng-model="filter.to"
                    on-change="$ctrl.to = value">
                </vn-date-picker>
-                <vn-none class="or vn-px-md">O</vn-none>
+                <vn-none class="or vn-px-md" translate>Or</vn-none>
                <vn-input-number
                    vn-one
                    min="0"
--- a/modules/ticket/front/search-panel/locale/es.yml
+++ b/modules/ticket/front/search-panel/locale/es.yml
@ -18,3 +18,4 @@ DELIVERED: Servido
 ON_PREPARATION: En preparacion
 PACKED: Encajado
 Cannot choose a range of dates and days onward at the same time: No se puede selecionar un rango de fechas y días en adelante a la vez
+Or: O