diff --git a/app/assets/javascripts/timelines_select_boxes.js b/app/assets/javascripts/timelines_select_boxes.js index 1cb66d0148..08f86c7662 100644 --- a/app/assets/javascripts/timelines_select_boxes.js +++ b/app/assets/javascripts/timelines_select_boxes.js @@ -55,7 +55,7 @@ jQuery(document).ready(function($) { $("#timeline_options_planning_element_responsibles"), $("#timeline_options_grouping_two_selection") ].each(function (item) { - $(item).timelinesAutocomplete({ ajax: {null_element: {id: -1, name: I18n.t("js.timelines.filter.none")}} }); + $(item).timelinesAutocomplete({ ajax: {null_element: {id: -1, name: I18n.t("js.timelines.filter.noneElement")}} }); }); [ @@ -104,7 +104,7 @@ jQuery(document).ready(function($) { query : OpenProject.Helpers.Search.projectQueryWithHierarchy( jQuery.proxy(openProject, 'fetchProjects'), 20), - ajax: {null_element: {id: -1, name: I18n.t("js.timelines.filter.none")}} + ajax: {null_element: {id: -1, name: I18n.t("js.timelines.filter.noneElement")}} }); }); @@ -121,7 +121,7 @@ jQuery(document).ready(function($) { query : OpenProject.Helpers.Search.projectQueryWithHierarchy( jQuery.proxy(openProject, 'fetchProjects'), 20), - ajax: {null_element: {id: -1, name: I18n.t("js.timelines.filter.none")}} + ajax: {null_element: {id: -1, name: I18n.t("js.timelines.filter.noneElement")}} }); }); diff --git a/app/helpers/timelines_helper.rb b/app/helpers/timelines_helper.rb index a2c3880c6d..440d0c7de4 100644 --- a/app/helpers/timelines_helper.rb +++ b/app/helpers/timelines_helper.rb @@ -260,7 +260,7 @@ module TimelinesHelper end def none_option - result = [[l('timelines.filter.none'), -1]] + result = [[l('timelines.filter.noneSelection'), -1]] end def filter_select_i18n_array_with_index_and_none(array, i18n_prefix) diff --git a/app/models/timeline.rb b/app/models/timeline.rb index 7d7f0d9bd3..975d619334 100644 --- a/app/models/timeline.rb +++ b/app/models/timeline.rb @@ -35,7 +35,7 @@ class Timeline < ActiveRecord::Base end def name - @name ||= ::I18n.t('timelines.filter.none') + @name ||= ::I18n.t('timelines.filter.noneElement') end end diff --git a/app/views/timelines/_timeline.html.erb b/app/views/timelines/_timeline.html.erb index 8d68413755..eae343a9d7 100644 --- a/app/views/timelines/_timeline.html.erb +++ b/app/views/timelines/_timeline.html.erb @@ -49,6 +49,7 @@ See doc/COPYRIGHT.rdoc for more details. 'timelines.errors.not_implemented', 'timelines.errors.report_comparison', 'timelines.empty', + 'timelines.filter.noneSelection', 'timelines.filter.column.due_date', 'timelines.filter.column.name', 'timelines.filter.column.type', diff --git a/config/locales/de.yml b/config/locales/de.yml index a6f93e9137..2d0de3199b 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -544,7 +544,8 @@ de: due_date: "Abschlussdatum" error: "Ein Fehler ist aufgetreten." filter: - none: "(keines)" + noneElement: "(keines)" + noneSelection: "(keine)" name: "Name" project_status: "Projekt-Status" project_type: "Projekt-Typ" @@ -1397,7 +1398,8 @@ de: grouping_two: "Zweites Gruppierungskriterium" grouping_two_phrase: "Hat eine Abhängigkeit zu Projekttyp" hide_chart: "Diagramm ausblenden" - none: "(keines)" + noneElement: "(keines)" + noneSelection: "(keine)" outline: "Zu Beginn angezeigte Hierarchie" parent: "Zeige Unterprojekte von" planning_element_filters: "Planungselemente filtern" diff --git a/config/locales/en.yml b/config/locales/en.yml index 5dfa21a6ad..e6a17e7e92 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -547,7 +547,8 @@ en: create_planning_select_project: "Project:" really_close_dialog: "Do you really want to close the dialog and loose the entered data?" filter: - none: "(none)" + noneElement: "(none)" + noneSelection: "(none)" label_account: "Account" label_activity: "Activity" @@ -1386,7 +1387,8 @@ en: grouping_two: "Second grouping criterion" grouping_two_phrase: "Has a dependency to project type" hide_chart: "Hide chart" - none: "(none)" + noneElement: "(none)" + noneSelection: "(none)" outline: "Intitial outline expansion" parent: "Show subprojects of" planning_element_filters: "Filter planning elements" diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index 737a799fc0..8d1615e146 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -29,6 +29,7 @@ See doc/COPYRIGHT.rdoc for more details. # Changelog +* `#902` Spelling Mistake: Timelines Report Configuration * `#959` Too many available responsibles returned for filtering in Timelines * `#1738` Forum problem when no description given. * `#1916` Work package update screen is closed when attached file is deleted