diff options
| author | erdgeist <erdgeist@erdgeist.org> | 2026-07-25 17:45:34 +0200 |
|---|---|---|
| committer | erdgeist <erdgeist@erdgeist.org> | 2026-07-25 17:45:34 +0200 |
| commit | fe104aa2c52f61cd8555fbc98c20501f50f4aae8 (patch) | |
| tree | 4596bfa52d316c05096e176b88fc004409cabbf9 /app/views/revisions/diff.html.erb | |
| parent | 22c690749e154a5426c4f190fbbc08a5dee2eeee (diff) | |
Extract admin strings to i18n: revisions, page_translations, and menu items,
Diffstat (limited to 'app/views/revisions/diff.html.erb')
| -rw-r--r-- | app/views/revisions/diff.html.erb | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/app/views/revisions/diff.html.erb b/app/views/revisions/diff.html.erb index 7e7b729e..1318bd37 100644 --- a/app/views/revisions/diff.html.erb +++ b/app/views/revisions/diff.html.erb | |||
| @@ -1,18 +1,18 @@ | |||
| 1 | <h1>Revisions#diff</h1> | 1 | <h1><%= t(".title") %></h1> |
| 2 | 2 | ||
| 3 | <p class="node_action_bar standalone_action_bar"> | 3 | <p class="node_action_bar standalone_action_bar"> |
| 4 | <%= link_to 'Revisions', node_revisions_path(@node) %> | 4 | <%= link_to t(".revisions_link"), node_revisions_path(@node) %> |
| 5 | </p> | 5 | </p> |
| 6 | 6 | ||
| 7 | <p class="diff_comparison_label"> | 7 | <p class="diff_comparison_label"> |
| 8 | Comparing <strong><%= describe_page_reference(params[:start_revision]) %></strong> | 8 | <%= t(".comparing") %> <strong><%= describe_page_reference(params[:start_revision]) %></strong> |
| 9 | against <strong><%= describe_page_reference(params[:end_revision]) %></strong> | 9 | <%= t(".against") %> <strong><%= describe_page_reference(params[:end_revision]) %></strong> |
| 10 | — showing the <strong><%= @locale.to_s.upcase %></strong> translation | 10 | <%= t(".showing_prefix") %> <strong><%= @locale.to_s.upcase %></strong> <%= t(".translation_suffix") %> |
| 11 | </p> | 11 | </p> |
| 12 | 12 | ||
| 13 | <% if @locale_summary.size > 1 %> | 13 | <% if @locale_summary.size > 1 %> |
| 14 | <p class="diff_locale_toggle"> | 14 | <p class="diff_locale_toggle"> |
| 15 | Locale: | 15 | <%= t("revisions.locale_label") %> |
| 16 | <% @locale_summary.each_with_index do |s, i| %> | 16 | <% @locale_summary.each_with_index do |s, i| %> |
| 17 | <%= " · ".html_safe if i > 0 %> | 17 | <%= " · ".html_safe if i > 0 %> |
| 18 | <% label = "#{s[:locale].to_s.upcase}#{' *' if s[:changed]}" %> | 18 | <% label = "#{s[:locale].to_s.upcase}#{' *' if s[:changed]}" %> |
| @@ -23,21 +23,21 @@ | |||
| 23 | <% end %> | 23 | <% end %> |
| 24 | <% end %> | 24 | <% end %> |
| 25 | </p> | 25 | </p> |
| 26 | <p class="field_hint">* has a difference between these two versions.</p> | 26 | <p class="field_hint"><%= t(".changed_hint") %></p> |
| 27 | <% end %> | 27 | <% end %> |
| 28 | 28 | ||
| 29 | <p class="diff_view_toggle"> | 29 | <p class="diff_view_toggle"> |
| 30 | View: | 30 | <%= t(".view_label") %> |
| 31 | <% if @diff_view == :inline %> | 31 | <% if @diff_view == :inline %> |
| 32 | <strong>Inline</strong> | 32 | <strong><%= t("revisions.inline") %></strong> |
| 33 | <% else %> | 33 | <% else %> |
| 34 | <%= link_to 'Inline', diff_node_revisions_path(@node, start_revision: params[:start_revision], end_revision: params[:end_revision], view: 'inline', locale: @locale) %> | 34 | <%= link_to t("revisions.inline"), diff_node_revisions_path(@node, start_revision: params[:start_revision], end_revision: params[:end_revision], view: 'inline', locale: @locale) %> |
| 35 | <% end %> | 35 | <% end %> |
| 36 | · | 36 | · |
| 37 | <% if @diff_view == :side_by_side %> | 37 | <% if @diff_view == :side_by_side %> |
| 38 | <strong>Side by side</strong> | 38 | <strong><%= t("revisions.side_by_side") %></strong> |
| 39 | <% else %> | 39 | <% else %> |
| 40 | <%= link_to 'Side by side', diff_node_revisions_path(@node, start_revision: params[:start_revision], end_revision: params[:end_revision], view: 'side_by_side', locale: @locale) %> | 40 | <%= link_to t("revisions.side_by_side"), diff_node_revisions_path(@node, start_revision: params[:start_revision], end_revision: params[:end_revision], view: 'side_by_side', locale: @locale) %> |
| 41 | <% end %> | 41 | <% end %> |
| 42 | </p> | 42 | </p> |
| 43 | 43 | ||
| @@ -49,17 +49,17 @@ | |||
| 49 | <%= select_tag :end_revision, options_for_select(@node.pages.map{|x| x.revision}, params[:end_revision].to_i) %> | 49 | <%= select_tag :end_revision, options_for_select(@node.pages.map{|x| x.revision}, params[:end_revision].to_i) %> |
| 50 | <%= hidden_field_tag :view, @diff_view %> | 50 | <%= hidden_field_tag :view, @diff_view %> |
| 51 | <%= hidden_field_tag :locale, @locale %> | 51 | <%= hidden_field_tag :locale, @locale %> |
| 52 | <%= submit_tag 'Diff' %> | 52 | <%= submit_tag t(".diff_button") %> |
| 53 | <% end %> | 53 | <% end %> |
| 54 | <% else %> | 54 | <% else %> |
| 55 | <p class="node_action_bar standalone_action_bar"><%= link_to 'Compare two numbered revisions instead', node_revisions_path(@node) %></p> | 55 | <p class="node_action_bar standalone_action_bar"><%= link_to t(".compare_numbered"), node_revisions_path(@node) %></p> |
| 56 | <% end %> | 56 | <% end %> |
| 57 | 57 | ||
| 58 | <% if @available_layer_pairs.present? %> | 58 | <% if @available_layer_pairs.present? %> |
| 59 | <div class="node_action_bar standalone_action_bar"> | 59 | <div class="node_action_bar standalone_action_bar"> |
| 60 | <% @available_layer_pairs.each do |pair| %> | 60 | <% @available_layer_pairs.each do |pair| %> |
| 61 | <% next if [params[:start_revision].to_s, params[:end_revision].to_s].sort == pair.map(&:to_s).sort %> | 61 | <% next if [params[:start_revision].to_s, params[:end_revision].to_s].sort == pair.map(&:to_s).sort %> |
| 62 | <%= button_to "Diff #{pair.first.to_s.capitalize} vs. #{pair.last.to_s.capitalize}", | 62 | <%= button_to t("nodes.show.diff_layers", :from => t("nodes.show.layer_#{pair.first}"), :to => t("nodes.show.layer_#{pair.last}")), |
| 63 | diff_node_revisions_path(@node), | 63 | diff_node_revisions_path(@node), |
| 64 | method: :get, | 64 | method: :get, |
| 65 | params: { start_revision: pair.first, end_revision: pair.last, view: @diff_view, locale: @locale }, | 65 | params: { start_revision: pair.first, end_revision: pair.last, view: @diff_view, locale: @locale }, |
| @@ -68,9 +68,9 @@ | |||
| 68 | <% if !@locked_by_other && (@node.autosave || @node.draft) %> | 68 | <% if !@locked_by_other && (@node.autosave || @node.draft) %> |
| 69 | <%= button_to revert_node_path(@node), method: :put, | 69 | <%= button_to revert_node_path(@node), method: :put, |
| 70 | params: { return_to: request.fullpath }, | 70 | params: { return_to: request.fullpath }, |
| 71 | form: { data: { confirm: "This cannot be undone. Continue?" }, class: 'button_to destructive' } do %> | 71 | form: { data: { confirm: t("admin.common.confirm_irreversible") }, class: 'button_to destructive' } do %> |
| 72 | <%= icon("trash", library: "tabler", "aria-hidden": true) %> | 72 | <%= icon("trash", library: "tabler", "aria-hidden": true) %> |
| 73 | <%= @node.draft && !@node.autosave ? "Destroy Draft" : "Discard Autosave" %> | 73 | <%= @node.draft && !@node.autosave ? t("nodes.show.destroy_draft") : t("nodes.show.discard_autosave") %> |
| 74 | <% end %> | 74 | <% end %> |
| 75 | <% end %> | 75 | <% end %> |
| 76 | </div> | 76 | </div> |
| @@ -80,34 +80,34 @@ | |||
| 80 | <% if @diff_view == :side_by_side %> | 80 | <% if @diff_view == :side_by_side %> |
| 81 | <div class="diff_side_by_side"> | 81 | <div class="diff_side_by_side"> |
| 82 | <div class="diff_column"> | 82 | <div class="diff_column"> |
| 83 | <h3>Title</h3> | 83 | <h3><%= Page.human_attribute_name(:title) %></h3> |
| 84 | <p><%= raw @diff[:title][0] %></p> | 84 | <p><%= raw @diff[:title][0] %></p> |
| 85 | <h3>Abstract</h3> | 85 | <h3><%= Page.human_attribute_name(:abstract) %></h3> |
| 86 | <p><%= raw @diff[:abstract][0] %></p> | 86 | <p><%= raw @diff[:abstract][0] %></p> |
| 87 | <h3>Body</h3> | 87 | <h3><%= Page.human_attribute_name(:body) %></h3> |
| 88 | <%= raw @diff[:body][0] %> | 88 | <%= raw @diff[:body][0] %> |
| 89 | </div> | 89 | </div> |
| 90 | <div class="diff_column"> | 90 | <div class="diff_column"> |
| 91 | <h3>Title</h3> | 91 | <h3><%= Page.human_attribute_name(:title) %></h3> |
| 92 | <p><%= raw @diff[:title][1] %></p> | 92 | <p><%= raw @diff[:title][1] %></p> |
| 93 | <h3>Abstract</h3> | 93 | <h3><%= Page.human_attribute_name(:abstract) %></h3> |
| 94 | <p><%= raw @diff[:abstract][1] %></p> | 94 | <p><%= raw @diff[:abstract][1] %></p> |
| 95 | <h3>Body</h3> | 95 | <h3><%= Page.human_attribute_name(:body) %></h3> |
| 96 | <%= raw @diff[:body][1] %> | 96 | <%= raw @diff[:body][1] %> |
| 97 | </div> | 97 | </div> |
| 98 | </div> | 98 | </div> |
| 99 | <% else %> | 99 | <% else %> |
| 100 | <h3>Title</h3> | 100 | <h3><%= Page.human_attribute_name(:title) %></h3> |
| 101 | <p><%= raw @diff[:title] %></p> | 101 | <p><%= raw @diff[:title] %></p> |
| 102 | <h3>Abstract</h3> | 102 | <h3><%= Page.human_attribute_name(:abstract) %></h3> |
| 103 | <p><%= raw @diff[:abstract] %></p> | 103 | <p><%= raw @diff[:abstract] %></p> |
| 104 | <h3>Body</h3> | 104 | <h3><%= Page.human_attribute_name(:body) %></h3> |
| 105 | <%= raw @diff[:body] %> | 105 | <%= raw @diff[:body] %> |
| 106 | <% end %> | 106 | <% end %> |
| 107 | 107 | ||
| 108 | <h3>Tags</h3> | 108 | <h3><%= Page.human_attribute_name(:tag_list) %></h3> |
| 109 | <% if @diff[:tags][:added].empty? && @diff[:tags][:removed].empty? %> | 109 | <% if @diff[:tags][:added].empty? && @diff[:tags][:removed].empty? %> |
| 110 | <p class="diff_unchanged">No change.</p> | 110 | <p class="diff_unchanged"><%= t(".no_change") %></p> |
| 111 | <% else %> | 111 | <% else %> |
| 112 | <ul class="diff_set_list"> | 112 | <ul class="diff_set_list"> |
| 113 | <% @diff[:tags][:added].each do |tag| %><li><ins><%= tag %></ins></li><% end %> | 113 | <% @diff[:tags][:added].each do |tag| %><li><ins><%= tag %></ins></li><% end %> |
| @@ -115,16 +115,16 @@ | |||
| 115 | </ul> | 115 | </ul> |
| 116 | <% end %> | 116 | <% end %> |
| 117 | 117 | ||
| 118 | <h3>Template</h3> | 118 | <h3><%= Page.human_attribute_name(:template_name) %></h3> |
| 119 | <% if @diff[:template_name][:changed] %> | 119 | <% if @diff[:template_name][:changed] %> |
| 120 | <p><del><%= @diff[:template_name][:from] || '(none)' %></del> <ins><%= @diff[:template_name][:to] || '(none)' %></ins></p> | 120 | <p><del><%= @diff[:template_name][:from] || t(".none_marker") %></del> <ins><%= @diff[:template_name][:to] || t(".none_marker") %></ins></p> |
| 121 | <% else %> | 121 | <% else %> |
| 122 | <p class="diff_unchanged">No change.</p> | 122 | <p class="diff_unchanged"><%= t(".no_change") %></p> |
| 123 | <% end %> | 123 | <% end %> |
| 124 | 124 | ||
| 125 | <h3>Assets</h3> | 125 | <h3><%= Page.human_attribute_name(:assets) %></h3> |
| 126 | <% if @diff[:assets][:added].empty? && @diff[:assets][:removed].empty? %> | 126 | <% if @diff[:assets][:added].empty? && @diff[:assets][:removed].empty? %> |
| 127 | <p class="diff_unchanged">No change.</p> | 127 | <p class="diff_unchanged"><%= t(".no_change") %></p> |
| 128 | <% else %> | 128 | <% else %> |
| 129 | <ul class="diff_set_list"> | 129 | <ul class="diff_set_list"> |
| 130 | <% @diff[:assets][:added].each do |asset| %><li><ins><%= asset.upload_file_name %></ins></li><% end %> | 130 | <% @diff[:assets][:added].each do |asset| %><li><ins><%= asset.upload_file_name %></ins></li><% end %> |
