diff options
| -rw-r--r-- | app/views/revisions/diff.html.erb | 16 | ||||
| -rw-r--r-- | config/locales/de.yml | 2 | ||||
| -rw-r--r-- | config/locales/en.yml | 2 |
3 files changed, 20 insertions, 0 deletions
diff --git a/app/views/revisions/diff.html.erb b/app/views/revisions/diff.html.erb index ba320365..5c881f24 100644 --- a/app/views/revisions/diff.html.erb +++ b/app/views/revisions/diff.html.erb | |||
| @@ -71,6 +71,22 @@ | |||
| 71 | <% end %> | 71 | <% end %> |
| 72 | 72 | ||
| 73 | <div id="diffview"> | 73 | <div id="diffview"> |
| 74 | <% current_summary = @locale_summary.find { |s| s[:locale] == @translation_locale } %> | ||
| 75 | <% if current_summary && !current_summary[:changed] %> | ||
| 76 | <% elsewhere = @locale_summary.select { |s| s[:changed] }.map { |s| | ||
| 77 | link_to s[:locale].to_s.upcase, diff_node_revisions_path(@node, | ||
| 78 | start_revision: params[:start_revision], end_revision: params[:end_revision], | ||
| 79 | view: @diff_view, translation_locale: s[:locale]) } %> | ||
| 80 | <p class="diff_unchanged diff_locale_pointer"> | ||
| 81 | <% if elsewhere.any? %> | ||
| 82 | <%= t(".unchanged_here_html", :lang => @translation_locale.to_s.upcase, | ||
| 83 | :others => safe_join(elsewhere, ", ")) %> | ||
| 84 | <% else %> | ||
| 85 | <%= t(".unchanged_anywhere") %> | ||
| 86 | <% end %> | ||
| 87 | </p> | ||
| 88 | <% end %> | ||
| 89 | |||
| 74 | <% if @diff_view == :side_by_side %> | 90 | <% if @diff_view == :side_by_side %> |
| 75 | <div class="diff_side_by_side"> | 91 | <div class="diff_side_by_side"> |
| 76 | <div class="diff_column"> | 92 | <div class="diff_column"> |
diff --git a/config/locales/de.yml b/config/locales/de.yml index d661bf2a..63f133f1 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml | |||
| @@ -697,6 +697,8 @@ de: | |||
| 697 | compare_numbered: "Stattdessen zwei nummerierte Revisionen vergleichen" | 697 | compare_numbered: "Stattdessen zwei nummerierte Revisionen vergleichen" |
| 698 | none_marker: "(keins)" | 698 | none_marker: "(keins)" |
| 699 | no_change: "Keine Änderung." | 699 | no_change: "Keine Änderung." |
| 700 | unchanged_here_html: "Keine Änderung in der Übersetzung %{lang} zwischen diesen Revisionen — geändert wurde %{others}." | ||
| 701 | unchanged_anywhere: "Zwischen diesen Revisionen wurde keine Übersetzung geändert." | ||
| 700 | index: | 702 | index: |
| 701 | title: "Revisionen für Node: %{path}" | 703 | title: "Revisionen für Node: %{path}" |
| 702 | back_to_node: "Zurück zum Node" | 704 | back_to_node: "Zurück zum Node" |
diff --git a/config/locales/en.yml b/config/locales/en.yml index b98c3d02..27098e87 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml | |||
| @@ -660,6 +660,8 @@ en: | |||
| 660 | compare_numbered: "Compare two numbered revisions instead" | 660 | compare_numbered: "Compare two numbered revisions instead" |
| 661 | none_marker: "(none)" | 661 | none_marker: "(none)" |
| 662 | no_change: "No change." | 662 | no_change: "No change." |
| 663 | unchanged_here_html: "No change in the %{lang} translation between these revisions — %{others} changed." | ||
| 664 | unchanged_anywhere: "No translation changed between these revisions." | ||
| 663 | index: | 665 | index: |
| 664 | title: "Revisions for Node: %{path}" | 666 | title: "Revisions for Node: %{path}" |
| 665 | back_to_node: "Back to node" | 667 | back_to_node: "Back to node" |
