Merge pull request #8761 from Dmoment/8457-missng-translation-or-between-buttons

removed translation or between buttons
2026-04-02 06:51:40 +00:00 · 2022-01-26 10:04:41 +00:00
parent 30b3b7455d 5a6f322fd7
commit cea4714296
29 changed files with 11 additions and 39 deletions
--- a/app/assets/javascripts/templates/admin/schedule_dialog.html.haml
+++ b/app/assets/javascripts/templates/admin/schedule_dialog.html.haml
@@ -21,5 +21,4 @@
      %input.button{ type: 'submit', value: "{{ 'js.admin.order_cycles.schedules.update_schedule' | t }}", ng: { show: 'schedule.id' } }
      %span{ ng: { show: 'schedule.id' } } or
      %input.button.red{ type: 'button', value: "{{ 'js.admin.order_cycles.schedules.delete_schedule' | t }}", ng: { show: 'schedule.id', click: 'delete()'} }
-      or
      %input.button{ type: 'button', value: "{{ 'actions.cancel' | t }}", ng: { click: 'close()' } }
--- a/app/assets/javascripts/templates/admin/show_more.html.haml
+++ b/app/assets/javascripts/templates/admin/show_more.html.haml
@@ -1,4 +1,3 @@
 %div{ ng: { show: "data.length > limit" } }
  %input{ type: 'button', value: t(:show_more), ng: { click: 'limit = limit + increment' } }
-  or
  %input{ type: 'button', value: t(:show_all_with_more, num: '{{ data.length - limit }}'), ng: { click: 'limit = data.length' } }
--- a/app/views/admin/contents/edit.html.haml
+++ b/app/views/admin/contents/edit.html.haml
@@ -10,5 +10,4 @@

    .form-buttons.filter-actions.actions{"data-hook" => "buttons"}
      = button t(:update), 'icon-refresh'
-      %span.or= t(:or)
      = link_to_with_icon 'icon-remove', t(:cancel), main_app.edit_admin_contents_path, class: 'button'
--- a/app/views/admin/customers/index.html.haml
+++ b/app/views/admin/customers/index.html.haml
@@ -100,5 +100,4 @@
      -# %show-more.text-center{ data: "filteredCustomers", limit: "customerLimit", increment: "20" }
      %div.text-center{ ng: { show: "filteredCustomers.length > customerLimit" } }
        %input{ type: 'button', value: t(:show_more), ng: { click: 'customerLimit = customerLimit + 20' } }
-        or
        %input{ type: 'button', value: t(:show_all_with_more, num: '{{ filteredCustomers.length - customerLimit }}'), ng: { click: 'customerLimit = filteredCustomers.length' } }
--- a/app/views/admin/order_cycles/_advanced_settings.html.haml
+++ b/app/views/admin/order_cycles/_advanced_settings.html.haml
@@ -25,5 +25,4 @@
  .row
    .sixteen.columns.alpha.omega.text-center
      %input{ type: 'submit', value: t('.save_reload') }
-      = t(:or)
      %a{ href: "#", onClick: "toggleSettings()" }= t(:close)
--- a/app/views/admin/order_cycles/_show_more.html.haml
+++ b/app/views/admin/order_cycles/_show_more.html.haml
@@ -1,4 +1,4 @@
 .text-center.margin-bottom-50{ ng: { hide: "RequestMonitor.loading" } }
  %input{ type: 'button', value: "#{t('admin.show_n_more', num: '30')} #{t(:days)}", ng: { click: 'showMore(30)' } }
-  or
+
  %input{ type: 'button', value: "#{t('admin.show_n_more', num: '90')} #{t(:days)}", ng: { click: 'showMore(90)' } }
--- a/app/views/admin/variant_overrides/_show_more.html.haml
+++ b/app/views/admin/variant_overrides/_show_more.html.haml
@@ -1,5 +1,5 @@
 -# %show-more.text-center{ data: "filteredProducts", limit: "productLimit", increment: "10" }
 .text-center{ ng: { show: "filteredProducts.length > productLimit" } }
  %input{ type: 'button', value: t(:show_more), ng: { click: 'productLimit = productLimit + 10' } }
-  = t(:or)
+
  %input{ type: 'button', value: "#{t(:show_all)} ({{ filteredProducts.length - productLimit }}  More)", ng: { click: 'productLimit = filteredProducts.length' } }
--- a/app/views/split_checkout/_guest.html.haml
+++ b/app/views/split_checkout/_guest.html.haml
@@ -8,6 +8,7 @@
        = t :label_login
      -if @order.distributor.allow_guest_orders?
        %span.checkout-submit-or
-          or
+          
        %button.button.cancel{ "data-action": "click->guest-checkout#guestSelected" }
          = t :checkout_as_guest
+
--- a/app/views/spree/admin/adjustments/edit.html.haml
+++ b/app/views/spree/admin/adjustments/edit.html.haml
@@ -16,5 +16,4 @@
    = render :partial => 'form', :locals => { :f => f }
    .filter-actions.actions{"data-hook" => "buttons"}
      = button Spree.t(:continue), 'icon-arrow-right'
-      %span.or= Spree.t(:or)
      = link_to_with_icon 'icon-remove', Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :class => 'button'
--- a/app/views/spree/admin/adjustments/new.html.haml
+++ b/app/views/spree/admin/adjustments/new.html.haml
@@ -15,5 +15,4 @@
    = render :partial => 'form', :locals => { :f => f }
    .filter-actions.actions{"data-hook" => "buttons"}
      = button Spree.t(:continue), 'icon-arrow-right'
-      %span.or= Spree.t(:or)
      = button_link_to Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :icon => 'icon-remove'
--- a/app/views/spree/admin/general_settings/edit.html.haml
+++ b/app/views/spree/admin/general_settings/edit.html.haml
@@ -95,5 +95,4 @@

      .form-buttons.filter-actions.actions{"data-hook" => "buttons"}
        = button Spree.t('actions.update'), 'icon-refresh'
-        %span.or= Spree.t(:or)
        = link_to_with_icon 'icon-remove', Spree.t('actions.cancel'), edit_admin_general_settings_url, :class => 'button'
--- a/app/views/spree/admin/images/edit.html.haml
+++ b/app/views/spree/admin/images/edit.html.haml
@@ -17,5 +17,4 @@
    .clear
    .form-buttons.filter-actions.actions
      = button t('spree.actions.update'), 'icon-refresh'
-      %span.or= t('spree.or')
      = link_to t('spree.actions.cancel'), admin_product_images_url(@product, @url_filters), id: 'cancel_link', class: 'button icon-remove'
--- a/app/views/spree/admin/images/new.html.haml
+++ b/app/views/spree/admin/images/new.html.haml
@@ -6,7 +6,6 @@
    = render partial: 'form', locals: { f: f }
    .form-buttons.filter-actions.actions
      = button t('actions.create'), 'icon-ok'
-      %span.or= t('spree.or')
      = link_to_with_icon 'icon-remove', t('spree.actions.cancel'), admin_product_images_url(@product, @url_filters), id: 'cancel_link', class: 'button'

 = javascript_include_tag 'admin/spree/images/new.js'
--- a/app/views/spree/admin/orders/_form.html.haml
+++ b/app/views/spree/admin/orders/_form.html.haml
@@ -20,8 +20,6 @@

    .filter-actions.actions{"ng-show" => "distributionChosen()"}
      = button t(:update_and_recalculate_fees), 'icon-refresh'
-      %span.or
-        = t(:or)
      = link_to_with_icon 'button icon-arrow-left', t(:back), spree.admin_orders_url

  = javascript_tag do
--- a/app/views/spree/admin/product_properties/index.html.haml
+++ b/app/views/spree/admin/product_properties/index.html.haml
@@ -48,7 +48,6 @@

    .form-buttons.filter-actions.actions
      = button t('spree.actions.update'), 'icon-refresh'
-      %span.or= t('spree.or')
      = link_to t('spree.actions.cancel'), admin_product_product_properties_url(@product, @url_filters), id: 'cancel_link', class: 'button icon-remove'

    = hidden_field_tag 'clear_product_properties', 'true'
--- a/app/views/spree/admin/products/edit.html.haml
+++ b/app/views/spree/admin/products/edit.html.haml
@@ -15,5 +15,5 @@
    = render :partial => 'form', :locals => { :f => f }
    .form-buttons.filter-actions.actions
      = button t(:update), 'icon-refresh'
-      %span.or= t(:or)
+
      = button_link_to t(:cancel), "#{collection_url}#{(@url_filters.empty? ? "" : "#?#{@url_filters.to_query}")}", icon: 'icon-remove'
--- a/app/views/spree/admin/products/group_buy_options.html.haml
+++ b/app/views/spree/admin/products/group_buy_options.html.haml
@@ -7,5 +7,4 @@
    = render partial: 'group_buy_form', locals: { f: f }
    .form-buttons.filter-actions.actions
      = button t('spree.actions.update'), 'icon-refresh'
-      %span.or= t('spree.or')
      = link_to t('spree.actions.cancel'), edit_admin_product_url(@product, @url_filters), id: 'cancel_link', class: 'button icon-remove'
--- a/app/views/spree/admin/products/new.html.haml
+++ b/app/views/spree/admin/products/new.html.haml
@@ -59,7 +59,7 @@
              %question-mark-with-tooltip{"question-mark-with-tooltip" => "_",
                "question-mark-with-tooltip-append-to-body" => "true",
                "question-mark-with-tooltip-placement" => "top",
-                "question-mark-with-tooltip-animation" => true, 
+                "question-mark-with-tooltip-animation" => true,
                key: "'js.admin.unit_price_tooltip'"}
            %input{ "type" => "text", "id" => "product_unit_price", "name" => "product[unit_price]",
                "class" => 'fullwidth', "disabled" =>  true, "ng-model" => "unit_price"}
@@ -104,11 +104,9 @@
  .sixteen.columns.alpha
    .form-buttons.filter-actions.actions
      = button t('actions.create'), 'icon-ok', :submit, value: "create"
-      %span.or
-        = t(".or")
+
      = button t('actions.create_and_add_another'), 'icon-repeat', :submit, value: 'add_another'
-      %span.or
-        = t(".or")
+
      = link_to_with_icon 'icon-remove', t('actions.cancel'), admin_products_path, :class => 'button'


--- a/app/views/spree/admin/products/seo.html.haml
+++ b/app/views/spree/admin/products/seo.html.haml
@@ -8,5 +8,4 @@
      = render :partial => 'seo_form', :locals => { :f => f }
      .form-buttons.filter-actions.actions
        = button t('spree.actions.update'), 'icon-refresh'
-        %span.or= t('spree.or')
        = link_to t('spree.actions.cancel'), edit_admin_product_url(@product, @url_filters), id: 'cancel_link', class: 'button icon-remove'
--- a/app/views/spree/admin/return_authorizations/edit.html.haml
+++ b/app/views/spree/admin/return_authorizations/edit.html.haml
@@ -22,5 +22,4 @@
    = render partial: 'form', locals: { f: f }
    .form-buttons.filter-actions.actions
      = button t('actions.update'), 'icon-repeat'
-      %span.or= t(:or)
      = button_link_to t('actions.cancel'), admin_order_return_authorizations_url(@order), icon: 'icon-remove'
--- a/app/views/spree/admin/return_authorizations/new.html.haml
+++ b/app/views/spree/admin/return_authorizations/new.html.haml
@@ -15,5 +15,4 @@
    = render partial: 'form', locals: { f: f }
    .form-buttons.filter-actions.actions
      = button t('.continue'), 'icon-arrow-right'
-      %span.or= t(:or)
      = button_link_to t('actions.cancel'), admin_order_return_authorizations_url(@order), icon: 'icon-remove'
--- a/app/views/spree/admin/shared/_edit_resource_links.html.haml
+++ b/app/views/spree/admin/shared/_edit_resource_links.html.haml
@@ -1,4 +1,3 @@
 .form-buttons.filter-actions.actions
  = button t(:update), 'icon-refresh'
-  %span.or= t(:or)
  = button_link_to t(:cancel), collection_url, icon: 'icon-remove'
--- a/app/views/spree/admin/shared/_new_resource_links.html.haml
+++ b/app/views/spree/admin/shared/_new_resource_links.html.haml
@@ -1,4 +1,3 @@
 .form-buttons.filter-actions.actions
  = button t('actions.create'), 'icon-ok'
-  %span.or= t(:or)
  = button_link_to t('actions.cancel'), collection_url, icon: 'icon-remove'
--- a/app/views/spree/admin/taxonomies/edit.haml
+++ b/app/views/spree/admin/taxonomies/edit.haml
@@ -28,5 +28,4 @@
    %br/
    .filter-actions.actions
      = button t('spree.actions.update'), 'icon-refresh'
-      %span.or= t("spree.or")
      = button_link_to t('spree.actions.cancel'), admin_taxonomies_path, icon: 'icon-remove'
--- a/app/views/spree/admin/taxons/edit.html.haml
+++ b/app/views/spree/admin/taxons/edit.html.haml
@@ -13,5 +13,4 @@
  = render partial: 'form', locals: { f: f }
  .form-buttons
    = button t('spree.actions.update'), 'icon-refresh'
-    = t("spree.or")
    = button_link_to t('spree.actions.cancel'), edit_admin_taxonomy_url(@taxonomy), icon: "icon-remove"
--- a/app/views/spree/admin/users/_api_fields.html.haml
+++ b/app/views/spree/admin/users/_api_fields.html.haml
@@ -8,7 +8,6 @@
    .filter-actions.actions
      = form_tag spree.clear_api_key_admin_user_path(@user), method: :put do
        = button t('spree.api.clear_key'), 'icon-trash'
-      %span.or= t(:or)
      = form_tag spree.generate_api_key_admin_user_path(@user), method: :put do
        = button t('spree.api.regenerate_key'), 'icon-refresh'
  - else
--- a/app/views/spree/admin/variants/edit.html.haml
+++ b/app/views/spree/admin/variants/edit.html.haml
@@ -12,5 +12,4 @@
      = render partial: 'form', locals: { f: f }
  .form-buttons.filter-actions.actions
    = button t(:update), 'icon-refresh'
-    %span.or= t(:or)
    = button_link_to t(:cancel), collection_url(@url_filters), icon: 'icon-remove'
--- a/app/views/spree/admin/variants/new.html.haml
+++ b/app/views/spree/admin/variants/new.html.haml
@@ -9,5 +9,4 @@

  .form-buttons.filter-actions.actions
    = button t('actions.create'), 'icon-ok'
-    %span.or= t(:or)
    = button_link_to t('actions.cancel'), collection_url(@url_filters), icon: 'icon-remove'
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -200,7 +200,7 @@ en:
      logged_in_succesfully: "Logged in successfully"
    sessions:
      signed_out: "Signed out successfully."
-      already_signed_out: "Signed out successfully."      
+      already_signed_out: "Signed out successfully."
    user_passwords:
      spree_user:
        updated_not_active: "Your password has been reset, but your email has not been confirmed yet."
@@ -345,7 +345,6 @@ en:
  required_fields: Required fields are denoted with an asterisk
  select_continue: Select and Continue
  remove: Remove
-  or: or
  collapse_all:  Collapse all
  expand_all: Expand all
  loading: Loading...
@@ -1771,7 +1770,7 @@ en:
    step2:
      payment_method:
        title: Payment method
-      form: 
+      form:
        card_number:
          label: Card number
          placeholder: e.g. 4242 4242 4242 4242
@@ -2450,7 +2449,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
  new_order_cycle: "New Order Cycle"
  new_order_cycle_tooltip: "Open shop for a certain time period"
  select_a_coordinator_for_your_order_cycle: "Select a coordinator for your order cycle"
-  notify_producers: 'Notify producers'  
+  notify_producers: 'Notify producers'
  edit_order_cycle: "Edit Order Cycle"
  roles: "Roles"
  update: "Update"
@@ -3356,7 +3355,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using
    not_found: "Not found"
    notice_messages:
      variant_deleted: "Variant deleted"
-    or: "Or"
    payment_method_not_supported: "Payment method not supported"
    resend_authorization_email: "Resend authorization email"
    rma_credit: "RMA credit"
@@ -3849,7 +3847,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using
          on_demand: "On Demand"
          product_description: "Product Description"
          image: "Image"
-          or: "or"
        unit_name_placeholder: 'eg. bunches'
        index:
          header: