From aadcf8a21fd1c3a4eaf8fb1f682e544c2ee08cd2 Mon Sep 17 00:00:00 2001
From: Nils Kenneweg <n.kenneweg@finn.de>
Date: Mon, 28 Oct 2013 17:52:15 +0100
Subject: [PATCH] localization update planning element->work package

also removes some old translations.
---
 app/assets/javascripts/timelines.js           |  2 +-
 app/views/projects/_types_form.html.erb       |  2 +-
 app/views/timelines/_timeline.html.erb        |  2 +-
 .../_vertical_planning_elements.html.erb      |  4 +--
 .../filter/_planning_elements.html.erb        |  6 ++--
 app/views/types/index.html.erb                |  2 +-
 config/locales/de.yml                         | 30 +++++++------------
 config/locales/en.yml                         | 29 +++++++-----------
 doc/CHANGELOG.md                              |  1 +
 9 files changed, 30 insertions(+), 48 deletions(-)

diff --git a/app/assets/javascripts/timelines.js b/app/assets/javascripts/timelines.js
index fcfa092be1..98413dc297 100644
--- a/app/assets/javascripts/timelines.js
+++ b/app/assets/javascripts/timelines.js
@@ -4082,7 +4082,7 @@ Timeline = {
 
       containers[currentContainer++].append(
         jQuery(icon
-          .replace(/%t/, timeline.i18n('timelines.new_planning_element'))
+          .replace(/%t/, timeline.i18n('timelines.new_work_package'))
           .replace(/%c/, 'icon icon-add')
         ).click(function(e) {
           e.stopPropagation();
diff --git a/app/views/projects/_types_form.html.erb b/app/views/projects/_types_form.html.erb
index 9d30314b0d..3efa3877f1 100644
--- a/app/views/projects/_types_form.html.erb
+++ b/app/views/projects/_types_form.html.erb
@@ -18,7 +18,7 @@
                             @project.types.include?(type),
                             :id => "project_planning_element_type_ids_#{type.id}" %>
           <label class='hidden-for-sighted' for="project_planning_element_type_ids_<%= type.id %>">
-            <%= l('timelines.enable_planning_element_in_project', :type => type.name) %>
+            <%= l('timelines.enable_type_in_project', :type => type.name) %>
           </label>
         </td>
         <td>
diff --git a/app/views/timelines/_timeline.html.erb b/app/views/timelines/_timeline.html.erb
index eae343a9d7..ebea96bed4 100644
--- a/app/views/timelines/_timeline.html.erb
+++ b/app/views/timelines/_timeline.html.erb
@@ -70,7 +70,7 @@ See doc/COPYRIGHT.rdoc for more details.
                  'timelines.zoom.out',
                  'timelines.zoom.days',
                  'timelines.zoom.weeks',
-                 'timelines.new_planning_element',
+                 'timelines.new_work_package',
                  'timelines.zoom.months',
                  'timelines.zoom.quarters',
                  'timelines.zoom.years']
diff --git a/app/views/timelines/_vertical_planning_elements.html.erb b/app/views/timelines/_vertical_planning_elements.html.erb
index c91bf641b5..fb8a055356 100644
--- a/app/views/timelines/_vertical_planning_elements.html.erb
+++ b/app/views/timelines/_vertical_planning_elements.html.erb
@@ -29,14 +29,14 @@ See doc/COPYRIGHT.rdoc for more details.
 
 <fieldset id="filter_comparison" class="header_collapsible collapsible collapsed">
   <legend title="<%=l(:description_filter_toggle)%>", onclick="toggleFieldset(this);">
-    <a href="javascript:"><%= l('timelines.vertical_planning_elements') %></a>
+    <a href="javascript:"><%= l('timelines.vertical_work_package') %></a>
   </legend>
 
   <div style="display:none;">
     <div>
       <p class="tl-form-overflow">
         <%= label_tag :timeline_options_vertical_planning_elements,
-                      l('timelines.vertical_planning_elements') %>
+                      l('timelines.vertical_work_package') %>
         <%= text_field_tag "timeline[options][vertical_planning_elements]",
                            timeline.options["vertical_planning_elements"],
                            :size => 60, :class => "twoBlocks" %>
diff --git a/app/views/timelines/filter/_planning_elements.html.erb b/app/views/timelines/filter/_planning_elements.html.erb
index 67dad20de1..649f6cca5d 100644
--- a/app/views/timelines/filter/_planning_elements.html.erb
+++ b/app/views/timelines/filter/_planning_elements.html.erb
@@ -29,14 +29,14 @@ See doc/COPYRIGHT.rdoc for more details.
 
 <fieldset id="planning_element_filters" class="header_collapsible collapsible collapsed">
   <legend title="<%=l(:description_filter_toggle)%>", onclick="toggleFieldset(this);">
-    <a href="javascript:"><%= l('timelines.filter.planning_element_filters') %></a>
+    <a href="javascript:"><%= l('timelines.filter.work_package_filters') %></a>
   </legend>
 
   <div style="display:none;">
     <div>
       <p class="tl-form-overflow">
         <%= label_tag :timeline_options_exclude_own_planning_elements,
-                      l('timelines.filter.exclude_own_planning_elements') %>
+                      l('timelines.filter.exclude_own_work_packages') %>
 
         <%= check_box_tag("timeline[options][exclude_own_planning_elements]",
                           :yes,
@@ -98,7 +98,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
       <p class="tl-form-overflow">
         <%= label_tag 'timeline_options_planning_element_responsibles',
-                      l("timelines.filter.planning_element_responsible") %>
+                      l("timelines.filter.work_package_responsible") %>
 
         <% if User.current.impaired? %>
           <%= select("timeline[options]",
diff --git a/app/views/types/index.html.erb b/app/views/types/index.html.erb
index eb05e6154e..85610277df 100644
--- a/app/views/types/index.html.erb
+++ b/app/views/types/index.html.erb
@@ -48,7 +48,7 @@ See doc/COPYRIGHT.rdoc for more details.
       <th class="timelines-pet-is_default">
         <%= Type.human_attribute_name(:is_default) %>
       </th>
-      <th class="timelines-pet-in_aggregation" title="<%= l('timelines.planning_elements_are_displayed_in_aggregations') %>">
+      <th class="timelines-pet-in_aggregation" title="<%= l('timelines.work_packages_are_displayed_in_aggregations') %>">
         <%= Type.human_attribute_name(:in_aggregation) %>
       </th>
       <th class="timelines-pet-is_milestone">
diff --git a/config/locales/de.yml b/config/locales/de.yml
index cb1b1220bc..c53ad63c85 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -885,7 +885,6 @@ de:
   label_this_year: "aktuelles Jahr"
   label_time_entry_plural: "Benötigte Zeit"
   label_time_tracking: "Zeiterfassung"
-  label_planning_element_plural: "Planungselemente"
   label_today: "heute"
   label_top_menu: "Hauptmenu"
   label_topic_plural: "Themen"
@@ -1359,7 +1358,7 @@ de:
     edit_thing: "Bearbeiten"
     edit_timeline: "Zeitplan-Report bearbeiten"
     empty: "(leer)"
-    enable_planning_element_in_project: 'Planungselement-Typ "%{type}" aktivieren'
+    enable_type_in_project: 'Typ "%{type}" aktivieren'
     end: "Abschluss"
     errors:
       not_implemented: "Der Zeitplan-Report konnte nicht gezeichnet werden, da eine noch nicht implementierte Funktionalität benutzt wird."
@@ -1394,7 +1393,7 @@ de:
         days: "Tagen"
         weeks: "Wochen"
         months: "Monaten"
-      exclude_own_planning_elements: "Planungselemente dieses Projektes ausblenden"
+      exclude_own_work_packages: "Arbeitspackete dieses Projektes ausblenden"
       exclude_reporters: "Andere Projekte ausblenden"
       exclude_empty: "Leere Projekte ausblenden"
       grouping: "Gruppierung"
@@ -1409,10 +1408,10 @@ de:
       noneSelection: "(keine)"
       outline: "Zu Beginn angezeigte Hierarchie"
       parent: "Zeige Unterprojekte von"
-      planning_element_filters: "Planungselemente filtern"
-      planning_element_responsible: "Planungselemente von diesem Planungsverantwortlichen anzeigen"
+      work_package_filters: "Arbeitspackete filtern"
+      work_package_responsible: "Arbeitspackete von diesem Planungsverantwortlichen anzeigen"
 
-      project_time_filter: "Projekte mit Planungselementen eines Typs in einem Zeitfenster"
+      project_time_filter: "Projekte mit Arbeitspacket eines Typs in einem Zeitfenster"
       project_time_filter_historical: "von %{startdate} bis %{enddate}"
       project_time_filter_relative: "vor %{startspan}%{startspanunit} bis in %{endspan}%{endspanunit}"
       project_filters: "Projekte filtern"
@@ -1429,7 +1428,7 @@ de:
     history: "Historie"
     new_association: "Neue Abhängigkeit"
     new_color: "Neue Farbe"
-    new_planning_element: "Neues Planungselement"
+    new_work_package: "Neues Arbeitspacket"
     new_project_type: "Neuer Projekt-Typ"
     new_reporting: "Neuer Statusbericht"
     new_timeline: "Neuer Zeitplan-Report"
@@ -1453,8 +1452,7 @@ de:
       reports: "Zeitplan-Reporte"
       timelines: "Zeitpläne"
 
-    planning_element_could_not_be_saved: "Planungselement konnte nicht gespeichert werden"
-    planning_elements_are_displayed_in_aggregations: "Planungselemente werden in Aggregation angezeigt"
+    work_packages_are_displayed_in_aggregations: "Arbeitspackete werden in Aggregation angezeigt"
     project_association_new: "Projekt-Abhängigkeit hinzufügen"
     project_association_new_for_with: "Anlegen der Projekt-Abhängigkeit von “%{project_a}” zu"
     project_association_with_other: "Projekt-Abhängigkeit zwischen “%{project_a}” und “%{project_b}”"
@@ -1474,11 +1472,7 @@ de:
       show: "Statusbericht: %{comment}"
     really_delete_color: >
       Möchten Sie die folgende Farbe wirklich löschen?
-      Planungselement-Typen, die diese Farbe verwenden, bleiben erhalten.
-    really_delete_all_planning_elements: >
-      Möchten Sie wirklich alle folgenden Planungselemente und ihre
-      Kind-Elemente permanent löschen? Diese Operation kann nicht rückgängig
-      gemacht werden.
+      Typen, die diese Farbe verwenden, bleiben erhalten.
     really_delete_project_association_between_project_a_and_project_b: >
       Möchten Sie die Projekt-Abhängigkeit zwischen „%{project_a}“ und
       „%{project_b}“ wirklich löschen?
@@ -1487,7 +1481,7 @@ de:
       Projekte dieses Typs bleiben erhalten.
     really_delete_timeline: >
       Möchten Sie dieses Zeitplan-Report wirklich löschen?
-      Planungselemente dieses Reports bleiben erhalten.
+      Arbeitspackete dieses Reports bleiben erhalten.
     really_delete_reporting: >
       Möchten Sie diesen Statusbericht wirklich löschen?
       Vorherige gemeldete Statusberichte gehen dabei verloren.
@@ -1495,12 +1489,8 @@ de:
     timeline: "Zeitplan-Report"
     timelines: "Zeitplan-Reporte"
     settings: "Timelines"
-    used_in_x_planning_elements:
-      one:   "Wird in %{count} Planungselement verwendet"
-      other: "Wird in %{count} Planungselementen verwendet"
-    vertical_planning_elements: "Vertikale Planungselemente"
+    vertical_work_package: "Vertikale Arbeitspackete"
     without_project_type: "Ohne Projekt-Typ"
-    you_are_viewing_all_planning_elements_in_this_project: "Sie sehen alle Planungselemente innerhalb dieses Projekts"
     you_are_viewing_the_selected_timeline: "Sie sehen den ausgewählten Zeitplan-Report"
     zoom:
       in: "Mehr Details"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 730c1bef54..3588e687e1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -880,7 +880,6 @@ en:
   label_this_year: "this year"
   label_time_entry_plural: "Spent time"
   label_time_tracking: "Time tracking"
-  label_planning_element_plural: "Planning elements"
   label_today: "today"
   label_top_menu: "Top Menu"
   label_topic_plural: "Topics"
@@ -1347,7 +1346,7 @@ en:
     edit_thing: "Edit"
     edit_timeline: "Edit timeline report"
     empty: "(empty)"
-    enable_planning_element_in_project: 'Enable planning element type "%{type}"'
+    enable_type_in_project: 'Enable type "%{type}"'
     end: "End"
     errors:
       not_implemented: "The timeline could not be rendered because it uses a feature that is not yet implemented."
@@ -1382,7 +1381,7 @@ en:
         days: "days"
         weeks: "weeks"
         months: "months"
-      exclude_own_planning_elements: "Hide planning elements from this project"
+      exclude_own_work_packages: "Hide work packages from this project"
       exclude_reporters: "Hide other projects"
       exclude_empty: "Hide empty projects"
       grouping: "Grouping"
@@ -1397,12 +1396,12 @@ en:
       noneSelection: "(none)"
       outline: "Intitial outline expansion"
       parent: "Show subprojects of"
-      planning_element_filters: "Filter planning elements"
-      planning_element_responsible: "Show planning elements with responsible"
+      work_package_filters: "Filter work packages"
+      work_package_responsible: "Show work packages with responsible"
       types: "Show types"
       status: "Show status"
 
-      project_time_filter: "Projects with a planning element of a certain type in a certain timeframe"
+      project_time_filter: "Projects with a work package of a certain type in a certain timeframe"
       project_time_filter_historical: "from %{startdate} to %{enddate}"
       project_time_filter_relative: "from %{startspan}%{startspanunit} ago, to %{endspan}%{endspanunit} from now"
       project_filters: "Filter projects"
@@ -1417,7 +1416,7 @@ en:
     history: "History"
     new_color: "New color"
     new_association: "New dependency"
-    new_planning_element: "New planning element"
+    new_work_package: "New work package"
     new_project_type: "New project type"
     new_reporting: "New reporting"
     new_timeline: "New timeline report"
@@ -1444,9 +1443,8 @@ en:
       edit: "Edit status: %{comment}"
       show: "Status: %{comment}"
 
-    planning_element_could_not_be_saved: "Planning element could not be saved"
     planning_element_update: "Update: %{title}"
-    planning_elements_are_displayed_in_aggregations: "Planning elements are displayed in aggregations"
+    work_packages_are_displayed_in_aggregations: "Work packages are displayed in aggregations"
     project_association_new: Add project dependency
     project_association_new_for_with: Set dependency for “%{project_a}” with
     project_association_with_other: "Project dependency between “%{project_a}” and “%{project_b}”"
@@ -1457,10 +1455,7 @@ en:
     properties: "Properties"
     really_delete_color: >
       Are you sure, you want to delete the following color?
-      Planning element types using this color will not be deleted.
-    really_delete_all_planning_elements: >
-      Are you sure, you want to permanently delete all the following planning elements and all
-      its child elements? You cannot undo this operation.
+      Types using this color will not be deleted.
     really_delete_project_association_between_project_a_and_project_b: >
       Are you sure, you want to delete the dependency between “%{project_a}” and
       “%{project_b}”?
@@ -1469,7 +1464,7 @@ en:
       Projects using this type will not be deleted.
     really_delete_timeline: >
       Are you sure, you want to delete the following timeline report?
-      Planning elements shown in this timeline report will not be
+      Work packages shown in this timeline report will not be
       deleted.
     really_delete_reporting: >
       Are you sure, you want to delete the following reporting?
@@ -1478,12 +1473,8 @@ en:
     timeline: "Timeline report"
     timelines: "Timeline reports"
     settings: "Timelines"
-    used_in_x_planning_elements:
-      one:   "Used in %{count} planning element"
-      other: "Used in %{count} planning elements"
-    vertical_planning_elements: "Vertical planning elements"
+    vertical_work_package: "Vertical work packages"
     without_project_type: "Without project type"
-    you_are_viewing_all_planning_elements_in_this_project: "You are viewing all planning elements in this project"
     you_are_viewing_the_selected_timeline: "You are viewing the selected timeline report"
     zoom:
       in: "Zoom in"
diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
index 2564806b0b..3edf90806b 100644
--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@@ -29,6 +29,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 # Changelog
 
+* `#2574` Fix: Invalid filter options and outdated names in timeline report form
 * `#2618` Fix: When issues are renamed to work packages all watcher assignments are lost
 * Improved newline handling for journals