Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up i18n translations #676

Merged
merged 2 commits into from
Apr 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/views/accounts/_account_valuation_list.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
<% end %>
<%= link_to valuation_path(valuation.original),
data: { turbo_method: :delete,
turbo_confirm: { title: t("custom_turbo_confirm.history.title"),
body: t("custom_turbo_confirm.history.body_html"),
accept: t("custom_turbo_confirm.history.accept") } },
turbo_confirm: { title: t(".confirm_title"),
body: t(".confirm_body_html"),
accept: t(".confirm_accept") } },
class: "text-red-600 flex gap-1 items-center hover:bg-gray-50 rounded-md p-2" do %>
<%= lucide_icon("trash-2", class: "w-5 h-5 shrink-0") %>
<span class="text-sm">Delete entry</span>
Expand Down
6 changes: 3 additions & 3 deletions app/views/accounts/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
class: "block w-full py-2 text-red-600 hover:text-red-800 flex items-center",
data: {
turbo_confirm: {
title: t("custom_turbo_confirm.account_destroy.title"),
body: t("custom_turbo_confirm.account_destroy.body_html"),
accept: t("custom_turbo_confirm.account_destroy.accept", name: @account.name)
title: t(".confirm_title"),
body: t(".confirm_body_html"),
accept: t(".confirm_accept", name: @account.name)
}
} do %>
<%= lucide_icon("trash-2", class: "w-5 h-5 mr-2") %> Delete account
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</main>
</div>
<%= turbo_frame_tag "modal" %>
<%= render "shared/custom_confirm_modal" %>
<%= render "shared/confirm_modal" %>
<%= render "shared/upgrade_notification" %>
<% if self_hosted? %>
<div class="flex items-center py-0.5 px-0.5 gap-1 fixed bottom-2 right-2 shadow-xs border border-alpha-black-50 rounded-md bg-white">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<form method="dialog" class="p-4">
<div class="flex flex-col mb-4">
<div class="flex justify-between mb-2 gap-4">
<h3 id="turbo-confirm-title" class="font-medium text-md"><%= t("custom_turbo_confirm.default.title") %></h3>
<h3 id="turbo-confirm-title" class="font-medium text-md"><%= t(".title") %></h3>
<button value="cancel">
<%= lucide_icon("x", class: "w-5 h-5 shrink-0 text-gray-500") %>
</button>
</div>
<div id="turbo-confirm-body" class="text-gray-500 text-sm">
<%= t("custom_turbo_confirm.default.body_html") %>
<%= t(".body_html") %>
</div>
</div>
<button id="turbo-confirm-accept" class="w-full text-red-600 rounded-xl text-center p-[10px] border" value="confirm"><%= t("custom_turbo_confirm.default.accept") %></button>
<button id="turbo-confirm-accept" class="w-full text-red-600 rounded-xl text-center p-[10px] border" value="confirm"><%= t(".accept") %></button>
</form>
</dialog>
15 changes: 15 additions & 0 deletions config/locales/views/account/en.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
---
en:
accounts:
account_valuation_list:
confirm_accept: Delete entry
confirm_body_html: "<p>Deleting this entry will remove it from the account’s
history which will impact different parts of your account. This includes the
net worth and account graphs.</p></br><p>The only way you’ll be able to add
this entry back is by re-entering it manually via a new entry</p>"
confirm_title: Delete Entry?
create:
success: New account created successfully
destroy:
Expand All @@ -16,6 +23,14 @@ en:
placeholder: Example account name
select_accountable_type: What would you like to add?
title: Add an account
show:
confirm_accept: Delete "%{name}"
confirm_body_html: "<p>By deleting this account, you will erase its value history,
affecting various aspects of your overall account. This action will have a
direct impact on your net worth calculations and the account graphs.</p><br
/> <p>After deletion, there is no way you'll be able to restore the account
information because you'll need to add it as a new account.</p>"
confirm_title: Delete account?
summary:
new: New account
sync:
Expand Down
20 changes: 2 additions & 18 deletions config/locales/views/shared/en.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,10 @@
---
en:
custom_turbo_confirm:
account_destroy:
accept: Delete "%{name}"
body_html: "<p>By deleting this account, you will erase its value history, affecting
various aspects of your overall account. This action will have a direct impact
on your net worth calculations and the account graphs.</p><br /> <p>After
deletion, there is no way you'll be able to restore the account information
because you'll need to add it as a new account.</p>"
title: Delete account?
default:
shared:
confirm_modal:
accept: Confirm
body_html: "<p>You will not be able to undo this decision</p>"
title: Are you sure?
history:
accept: Delete entry
body_html: "<p>Deleting this entry will remove it from the account’s history
which will impact different parts of your account. This includes the net worth
and account graphs.</p></br><p>The only way you’ll be able to add this entry
back is by re-entering it manually via a new entry</p>"
title: Delete Entry?
shared:
notification:
dismiss: Dismiss
upgrade_notification:
Expand Down