Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Fixed translations

Damian Legawiec4249c8a8b98c
diff --git a/admin/app/views/spree/admin/orders/_adjustment.html.erb b/admin/app/views/spree/admin/orders/_adjustment.html.erb
index 8e09b79998..62aade2da0 100644
--- a/admin/app/views/spree/admin/orders/_adjustment.html.erb
+++ b/admin/app/views/spree/admin/orders/_adjustment.html.erb
@@ -23,19 +23,13 @@
</td>
<td>
<% if adjustment.closed? %>
- <span class="badge badge-light" title="<%= Spree.t(:adjustment_closed_description) %>">
- <%= icon('lock') %>
- <%= Spree.t(:closed) %>
+ <span class="badge badge-light" data-controller="tooltip">
+ <%= tooltip(Spree.t(:adjustment_closed_description)) %>
+ <%= icon('lock') %> <%= Spree.t(:closed) %>
</span>
<% else %>
- <span class="badge badge-success" title="<%= Spree.t(:adjustment_open_description) %>">
- <%= icon('lock-open') %>
- <%= Spree.t(:open) %>
- </span>
- <% end %>
- <% unless adjustment.eligible? %>
- <span class="badge badge-warning ml-1" title="<%= Spree.t(:ineligible_adjustment_description) %>">
- <%= Spree.t(:ineligible) %>
+ <span class="badge badge-success" data-controller="tooltip">
+ <%= tooltip(Spree.t(:adjustment_open_description)) %> <%= icon('lock-open') %> <%= Spree.t(:open) %>
</span>
<% end %>
</td>
@@ -58,7 +52,7 @@
class: "dropdown-item" %>
<% end %>
<%= link_to_with_icon adjustment.closed? ? "lock-open" : "lock",
- adjustment.closed? ? Spree.t(:open_adjustment) : Spree.t(:close_adjustment),
+ adjustment.closed? ? Spree.t('actions.open') : Spree.t('actions.close'),
spree.toggle_state_admin_order_adjustment_path(@order, adjustment),
data: { turbo_method: :put, turbo_confirm: Spree.t(:are_you_sure) },
class: "dropdown-item" %>
diff --git a/admin/app/views/spree/admin/orders/_summary.html.erb b/admin/app/views/spree/admin/orders/_summary.html.erb
index 2a5db2afd3..f86b0f5d9f 100644
--- a/admin/app/views/spree/admin/orders/_summary.html.erb
+++ b/admin/app/views/spree/admin/orders/_summary.html.erb
@@ -22,7 +22,7 @@
<% if @order.completed_at %>
<li class="list-group-item flex justify-between items-center border-0">
- <span><%= Spree.t(:completed_at) %></span>
+ <span><%= I18n.t('activerecord.attributes.spree/order.completed_at') %></span>
<span class="text-rightfont-bold">
<%= spree_time(@order.completed_at) %>
</span>
diff --git a/admin/app/views/spree/admin/orders/_taxes.html.erb b/admin/app/views/spree/admin/orders/_taxes.html.erb
index 9c70f50cb1..8a80f48f98 100644
--- a/admin/app/views/spree/admin/orders/_taxes.html.erb
+++ b/admin/app/views/spree/admin/orders/_taxes.html.erb
@@ -30,7 +30,7 @@
<div class="font-medium"><%= adjustment.label %></div>
<% if tax_rate.present? %>
<div class="text-sm text-gray-500">
- <%= link_to tax_rate.zone&.name || Spree.t(:all_zones), spree.edit_admin_tax_rate_path(tax_rate), class: "text-blue-600 hover:underline" %>
+ <%= link_to tax_rate.zone&.name || Spree.t(:all), spree.edit_admin_tax_rate_path(tax_rate), class: "text-blue-600 hover:underline" %>
</div>
<% end %>
</td>
@@ -47,11 +47,7 @@
<% end %>
</td>
<td>
- <% if adjustment.included? %>
- <span class="badge badge-info"><%= Spree.t(:yes) %></span>
- <% else %>
- <span class="badge badge-light"><%= Spree.t(:no) %></span>
- <% end %>
+ <%= active_badge(adjustment.included?) %>
</td>
<td>
<%= adjustment.adjustable.display_pre_tax_amount if adjustment.adjustable.respond_to?(:display_pre_tax_amount) %>
diff --git a/admin/app/views/spree/admin/orders/adjustments/_form.html.erb b/admin/app/views/spree/admin/orders/adjustments/_form.html.erb
index 1d5da3131c..b4b6b21845 100644
--- a/admin/app/views/spree/admin/orders/adjustments/_form.html.erb
+++ b/admin/app/views/spree/admin/orders/adjustments/_form.html.erb
@@ -3,4 +3,4 @@
required: true,
step: 0.01,
prepend: @order.currency,
- hint: Spree.t(:adjustment_amount_help) %>
\ No newline at end of file
+ help: Spree.t(:adjustment_amount_help) %>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/orders/adjustments/edit.html.erb b/admin/app/views/spree/admin/orders/adjustments/edit.html.erb
index 371957f74e..9515ebc202 100644
--- a/admin/app/views/spree/admin/orders/adjustments/edit.html.erb
+++ b/admin/app/views/spree/admin/orders/adjustments/edit.html.erb
@@ -1,12 +1,9 @@
<%= turbo_frame_tag :dialog do %>
- <%= dialog_header(Spree.t(:edit_adjustment)) %>
+ <%= dialog_header(Spree.t(:edit)) %>
<%= form_with model: @adjustment, url: spree.admin_order_adjustment_path(@order, @adjustment), data: { turbo_frame: '_top' } do |f| %>
<div class="dialog-body">
<%= render 'spree/admin/shared/error_messages', target: @adjustment %>
<%= render 'form', f: f %>
- <div class="alert alert-warning">
- <%= Spree.t(:editing_adjustment_warning) %>
- </div>
</div>
<div class="dialog-footer">
<%= dialog_discard_button %>
diff --git a/admin/app/views/spree/admin/orders/order_promotions/new.html.erb b/admin/app/views/spree/admin/orders/order_promotions/new.html.erb
index 15781b37b0..a882581709 100644
--- a/admin/app/views/spree/admin/orders/order_promotions/new.html.erb
+++ b/admin/app/views/spree/admin/orders/order_promotions/new.html.erb
@@ -4,7 +4,7 @@
<%= form_with url: spree.admin_order_order_promotions_path(@order) do |f| %>
<div class="dialog-body">
<%= f.spree_text_field :coupon_code,
- placeholder: Spree.t(:enter_coupon_code),
+ placeholder: Spree.t(:add_coupon_code),
autofocus: true %>
</div>
<div class="dialog-footer">
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index 5bc05fedb5..466d39945b 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -606,6 +606,7 @@ en:
actions:
approve: Approve
cancel: Cancel
+ close: Close
confirm: Confirm
connect: Connect
continue: Continue
@@ -617,6 +618,7 @@ en:
list: List
listing: Listing
new: New
+ open: Open
publish: Publish
receive: Mark as received
refund: Refund
@@ -694,7 +696,10 @@ en:
addresses: Addresses
adjustable: Adjustable
adjustment: Adjustment
+ adjustment_closed_description: The adjustment is closed, and will not be recalculated.
+ adjustment_open_description: The adjustment is open, and will be recalculated.
adjustment_amount: Amount
+ adjustment_amount_help: Positive values are charges, negative values are credits.
adjustment_labels:
tax_rates:
excluding_tax: "%{name}%{amount}"
@@ -731,6 +736,7 @@ en:
apis:
platform: Platform API
storefront: Storefront API
+ applied_to: Applied to
apply: Apply
apply_only_on_full_priced_items: Apply only on full priced items
apply_store_credit: Apply Store Credit
@@ -852,6 +858,7 @@ en:
click_and_drag_on_the_products_to_sort_them: Click and drag on the products to sort them.
clone: Clone
close: Close
+ closed: Closed
close_all_adjustments: Close All Adjustments
close_sidebar: Close sidebar
code: Code
@@ -1273,6 +1280,7 @@ en:
join_slack: Join Slack
key: Key
kind: Kind
+ label: Label
language: Language
last_name: Last Name
last_name_begins_with: Last Name Begins With
@@ -1311,6 +1319,8 @@ en:
make_sure_the_above_reimbursement_amount_is_correct: Make sure the above reimbursement amount is correct
manage_promotion_categories: Manage Promotion Categories
manage_variants: Manage Variants
+ manual: Manual
+ manual_adjustment: Manual Adjustment
manual_intervention_required: Manual intervention required
mark_as_default: Mark as default
master: Master
@@ -1432,6 +1442,7 @@ en:
next: Next
no_actions_added: No actions added
no_address_given: No address given
+ no_adjustments: No adjustments
no_available_date_set: No available date set
no_billing_address_available: No billing address available
no_cc_type: N/A
@@ -1447,6 +1458,7 @@ en:
no_products_added: No products added
no_products_found: No products found
no_products_in_price_list: No products in this price list
+ no_promotions_applied: No promotions applied
no_report_data: No report data
no_resource_found: No %{resource} found
no_results: No results
@@ -1456,6 +1468,7 @@ en:
no_shipping_address_available: No shipping address available
no_shipping_method_selected: No shipping method selected.
no_state_changes: No state changes yet.
+ no_taxes: No taxes
no_tracking_present: No tracking details provided.
none: None
none_selected: None Selected