Add labels to js-en.yml

pull/7963/head
Inga Mai 5 years ago
parent 0f4ce76ab5
commit cf55ffbbf9
  1. 2
      app/controllers/groups_controller.rb
  2. 16
      app/helpers/custom_fields_helper.rb
  3. 12
      app/helpers/settings_helper.rb
  4. 25
      config/locales/js-en.yml
  5. 19
      frontend/src/app/modules/admin/tabs/admin-tabs.component.ts
  6. 2
      modules/documents/app/models/document_category.rb
  7. 1
      modules/meeting/app/controllers/meetings_controller.rb

@ -31,6 +31,8 @@ class GroupsController < ApplicationController
include GroupsHelper
layout 'admin'
helper_method :gon
before_action :require_admin
before_action :find_group, only: [:destroy,
:show, :create_memberships, :destroy_membership,

@ -31,14 +31,14 @@
module CustomFieldsHelper
def custom_fields_tabs
[
{ name: 'WorkPackageCustomField', partial: 'custom_fields/tab', label: I18n.t(:label_work_package_plural) },
{ name: 'TimeEntryCustomField', partial: 'custom_fields/tab', label: I18n.t(:label_spent_time) },
{ name: 'ProjectCustomField', partial: 'custom_fields/tab', label: I18n.t(:label_project_plural) },
{ name: 'VersionCustomField', partial: 'custom_fields/tab', label: I18n.t(:label_version_plural) },
{ name: 'UserCustomField', partial: 'custom_fields/tab', label: I18n.t(:label_user_plural) },
{ name: 'GroupCustomField', partial: 'custom_fields/tab', label: I18n.t(:label_group_plural) },
{ name: 'TimeEntryActivityCustomField', partial: 'custom_fields/tab', label: I18n.t(TimeEntryActivity::OptionName) },
{ name: 'IssuePriorityCustomField', partial: 'custom_fields/tab', label: I18n.t(IssuePriority::OptionName) }
{ name: 'WorkPackageCustomField', partial: 'custom_fields/tab', label: :label_work_package_plural },
{ name: 'TimeEntryCustomField', partial: 'custom_fields/tab', label: :label_spent_time },
{ name: 'ProjectCustomField', partial: 'custom_fields/tab', label: :label_project_plural },
{ name: 'VersionCustomField', partial: 'custom_fields/tab', label: :label_version_plural },
{ name: 'UserCustomField', partial: 'custom_fields/tab', label: :label_user_plural },
{ name: 'GroupCustomField', partial: 'custom_fields/tab', label: :label_group_plural },
{ name: 'TimeEntryActivityCustomField', partial: 'custom_fields/tab', label: TimeEntryActivity::OptionName },
{ name: 'IssuePriorityCustomField', partial: 'custom_fields/tab', label: IssuePriority::OptionName }
]
end

@ -34,12 +34,12 @@ module SettingsHelper
def administration_settings_tabs
[
{ name: 'general', partial: 'settings/general', label: I18n.t(:label_general) },
{ name: 'display', partial: 'settings/display', label: I18n.t(:label_display) },
{ name: 'projects', partial: 'settings/projects', label: I18n.t(:label_project_plural) },
{ name: 'notifications', partial: 'settings/notifications', label: I18n.t('activerecord.attributes.user.mail_notification') },
{ name: 'mail_handler', partial: 'settings/mail_handler', label: I18n.t(:label_incoming_emails) },
{ name: 'repositories', partial: 'settings/repositories', label: I18n.t(:label_repository_plural) }
{ name: 'general', partial: 'settings/general', label: :label_general },
{ name: 'display', partial: 'settings/display', label: :label_display },
{ name: 'projects', partial: 'settings/projects', label: :label_project_plural },
{ name: 'notifications', partial: 'settings/notifications', label: :label_mail_notification },
{ name: 'mail_handler', partial: 'settings/mail_handler', label: :label_incoming_emails },
{ name: 'repositories', partial: 'settings/repositories', label: :label_repository_plural }
]
end

@ -47,6 +47,9 @@ en:
close_filter_title: "Close filter"
close_form_title: "Close form"
backlogs:
backlog_settings: "Backlog Settings"
button_add_watcher: "Add watcher"
button_back: "Back"
button_back_to_list_view: "Back to list view"
@ -190,6 +193,9 @@ en:
cannot_save_changes_with_message: "Cannot save your changes due to the following error: %{error}"
query_saving: "The view could not be saved."
embedded_table_loading: "The embedded view could not be loaded: %{message}"
enumeration_activities: "Activities (time tracking)"
enumeration_doc_categories: "Document categories"
enumeration_work_package_priorities: "Work package priorities"
filter:
description:
text_open_filter: "Open this filter with 'ALT' and arrow keys."
@ -261,6 +267,7 @@ en:
label_deactivate: "Deactivate"
label_descending: "Descending"
label_description: "Description"
label_display: "Display"
label_cancel_comment: "Cancel comment"
label_closed_work_packages: "closed"
label_collapse: "Collapse"
@ -281,25 +288,33 @@ en:
label_export: "Export"
label_filename: "File"
label_filesize: "Size"
label_general: "General"
label_greater_or_equal: ">="
label_group: 'Group'
label_group_by: "Group by"
label_group_plural: "Groups"
label_hide_attributes: "Show less"
label_hide_column: "Hide column"
label_hide_project_menu: "Collapse project menu"
label_in: "in"
label_in_less_than: "in less than"
label_in_more_than: "in more than"
label_incoming_emails: "Incoming emails"
label_information_plural: "Information"
label_import: "Import"
label_latest_activity: "Latest activity"
label_last_updated_on: "Last updated on"
label_less_or_equal: "<="
label_less_than_ago: "less than days ago"
label_loading: "Loading..."
label_mail_notification: "Email notifications"
label_me: "me"
label_meeting_agenda: "Agenda"
label_meeting_minutes: "Minutes"
label_menu_collapse: "collapse"
label_menu_expand: "expand"
label_more_than_ago: "more than days ago"
label_module_plural: "Modules"
label_next: "Next"
label_no_color: "No color"
label_no_data: "No data to display"
@ -317,12 +332,15 @@ en:
label_previous: "Previous"
label_per_page: "Per page:"
label_please_wait: "Please wait"
label_project_plural: "Projects"
label_visibility_settings: "Visibility settings"
label_quote_comment: "Quote this comment"
label_reset: "Reset"
label_remove_column: "Remove column"
label_remove_columns: "Remove selected columns"
label_remove_row: "Remove row"
label_repository: "Repository"
label_repository_plural: "Repositories"
label_save_as: "Save as"
label_select_watcher: "Select a watcher..."
label_selected_filter_list: "Selected filters"
@ -333,6 +351,7 @@ en:
label_sort_higher: "Move up"
label_sort_lower: "Move down"
label_sorting: "Sorting"
label_spent_time: "Spent time"
label_star_query: "Favored"
label_press_enter_to_save: "Press enter to save."
label_public_query: "Public"
@ -341,7 +360,9 @@ en:
label_subject: "Subject"
label_this_week: "this week"
label_today: "today"
label_time_entry_plural: "Spent time"
label_up: "Up"
label_user_plural: "Users"
label_activity_show_only_comments: "Show activities with comments only"
label_activity_show_all: "Show all activities"
label_total_progress: "%{percent}% Total progress"
@ -351,6 +372,8 @@ en:
label_warning: "Warning"
label_work_package: "Work package"
label_work_package_plural: "Work packages"
label_work_package_category_plural: "Work package categories"
label_work_package_types: "Work package types"
label_watch: "Watch"
label_watch_work_package: "Watch work package"
label_watcher_added_successfully: "Watcher successfully added!"
@ -363,6 +386,7 @@ en:
label_starred_queries: "Favorite views"
label_global_queries: "Public views"
label_custom_queries: "Private views"
label_custom_field_plural: "Custom fields"
label_columns: "Columns"
label_attachments: Files
label_drop_files: Drop files here
@ -383,6 +407,7 @@ en:
label_wait: "Please wait for configuration..."
label_upload_counter: "%{done} of %{count} files finished"
label_validation_error: "The work package could not be saved due to the following errors:"
label_version_plural: "Versions"
label_view_has_changed: "This view has unsaved changes. Click to save them."
help_texts:

@ -35,6 +35,7 @@ import {
import {DynamicBootstrapper} from "core-app/globals/dynamic-bootstrapper";
import {GonService} from "core-app/modules/common/gon/gon.service";
import {StateService} from '@uirouter/core';
import {I18nService} from "core-app/modules/common/i18n/i18n.service";
import {ScrollableTabsComponent} from "core-app/modules/common/tabs/scrollable-tabs.component";
@ -52,24 +53,26 @@ interface Tab {
})
export class AdminTabsComponent extends ScrollableTabsComponent {
public myTabs: Tab[] = [];
public currentTab: Tab;
public myTabs:Tab[] = [];
public currentTab:Tab;
public classes:string[] = ['settings--tabs', 'scrollable-tabs'];
public classes:string[] = ['admin--tabs', 'scrollable-tabs'];
private gonData:any = this.gon.get('admin_tabs');
constructor(readonly elementRef:ElementRef,
readonly $state:StateService,
readonly gon:GonService) {
readonly gon:GonService,
readonly I18n:I18nService) {
super();
// parse tabs from backend and map them to scrollable tabs structure
this.myTabs = jQuery.parseJSON(this.gonData.tabs);
this.tabs = jQuery.map(this.myTabs, (tab:any) => {
this.tabs = jQuery.map(this.myTabs, (tab:Tab) => {
return {
id: tab.name,
name: tab.label
} });
name: this.I18n.t('js.' + tab.label)
};
});
// highlight current tab
this.currentTab = jQuery.parseJSON(this.gonData.selected);
@ -81,7 +84,7 @@ export class AdminTabsComponent extends ScrollableTabsComponent {
this.currentTab = jQuery.grep(this.myTabs, thisTab => thisTab.name === tab)[0];
// set correct partial for selected tab
this.partial = this.currentTab.partial.split('/')[0] + '?tab=' + this.currentTab.name;
this.partial = window.location.pathname + '?tab=' + this.currentTab.name;
super.clickTab(tab);
}

@ -30,7 +30,7 @@
class DocumentCategory < Enumeration
has_many :documents, foreign_key: 'category_id'
OptionName = I18n.t(:enumeration_doc_categories)
OptionName = :enumeration_doc_categories
def option_name
OptionName

@ -35,6 +35,7 @@ class MeetingsController < ApplicationController
helper :watchers
helper :meeting_contents
helper_method :gon
include WatchersHelper
include PaginationHelper

Loading…
Cancel
Save