mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-03-15 17:33:31 +08:00
Fix rebase errors [SCI-1274]
This commit is contained in:
parent
ad8dd6d740
commit
c18bba9fbe
2 changed files with 26 additions and 38 deletions
|
@ -1,5 +1,5 @@
|
||||||
class RepositoriesController < ApplicationController
|
class RepositoriesController < ApplicationController
|
||||||
before_action :load_vars
|
before_action :load_vars, except: :repository_table_index
|
||||||
before_action :check_view_all_permissions, only: :index
|
before_action :check_view_all_permissions, only: :index
|
||||||
before_action :check_edit_and_destroy_permissions, only:
|
before_action :check_edit_and_destroy_permissions, only:
|
||||||
%(destroy destroy_modal rename_modal update)
|
%(destroy destroy_modal rename_modal update)
|
||||||
|
|
|
@ -148,42 +148,6 @@ en:
|
||||||
step: "Step comment"
|
step: "Step comment"
|
||||||
result: "Result comment"
|
result: "Result comment"
|
||||||
|
|
||||||
repositories:
|
|
||||||
nav:
|
|
||||||
breadcrumbs:
|
|
||||||
repositories: "Repositories"
|
|
||||||
index:
|
|
||||||
head_title: "Repositories"
|
|
||||||
title: "Repositories"
|
|
||||||
add_new_repository_tab: "Create new repository"
|
|
||||||
delete_flash: "\"%{name}\" repository was successfully deleted!"
|
|
||||||
rename_flash: "\"%{old_name}\" repository was successfully renamed to \"%{new_name}\"!"
|
|
||||||
no_teams:
|
|
||||||
title: "Your dashboard is empty!"
|
|
||||||
text: "It seems you're not a member of any team. See team management to sort it out."
|
|
||||||
options_dropdown:
|
|
||||||
header: "Edit repository"
|
|
||||||
rename: "Rename"
|
|
||||||
delete: "Delete"
|
|
||||||
modal_delete:
|
|
||||||
title_html: "Delete repository <em>%{name}</em>"
|
|
||||||
message_html: "Are you sure you want to delete repository <em>%{name}</em>? This action is irreversible."
|
|
||||||
alert_heading: "Deleting repository has following consequences:"
|
|
||||||
alert_line_1: "all data inside the repository will be lost;"
|
|
||||||
alert_line_2: "all references to repository items will be rendered as invalid."
|
|
||||||
delete: "Delete repository"
|
|
||||||
modal_rename:
|
|
||||||
title_html: "Rename repository <em>%{name}</em>"
|
|
||||||
name: "New repository name"
|
|
||||||
name_placeholder: "My repository"
|
|
||||||
rename: "Rename repository"
|
|
||||||
modal_create:
|
|
||||||
title: "Create new repository"
|
|
||||||
name_label: "Repository name"
|
|
||||||
name_placeholder: "My repository"
|
|
||||||
submit: "Create repository"
|
|
||||||
success_flash: "Repository <strong>%{name}</strong> successfully created."
|
|
||||||
|
|
||||||
comments:
|
comments:
|
||||||
options_dropdown:
|
options_dropdown:
|
||||||
header: "Comment options"
|
header: "Comment options"
|
||||||
|
@ -876,10 +840,34 @@ en:
|
||||||
index:
|
index:
|
||||||
head_title: "Repositories"
|
head_title: "Repositories"
|
||||||
title: "Repositories"
|
title: "Repositories"
|
||||||
no_repositories: "No repositories"
|
add_new_repository_tab: "Create new repository"
|
||||||
|
delete_flash: "\"%{name}\" repository was successfully deleted!"
|
||||||
|
rename_flash: "\"%{old_name}\" repository was successfully renamed to \"%{new_name}\"!"
|
||||||
no_teams:
|
no_teams:
|
||||||
title: "Your dashboard is empty!"
|
title: "Your dashboard is empty!"
|
||||||
text: "It seems you're not a member of any team. See team management to sort it out."
|
text: "It seems you're not a member of any team. See team management to sort it out."
|
||||||
|
options_dropdown:
|
||||||
|
header: "Edit repository"
|
||||||
|
rename: "Rename"
|
||||||
|
delete: "Delete"
|
||||||
|
modal_delete:
|
||||||
|
title_html: "Delete repository <em>%{name}</em>"
|
||||||
|
message_html: "Are you sure you want to delete repository <em>%{name}</em>? This action is irreversible."
|
||||||
|
alert_heading: "Deleting repository has following consequences:"
|
||||||
|
alert_line_1: "all data inside the repository will be lost;"
|
||||||
|
alert_line_2: "all references to repository items will be rendered as invalid."
|
||||||
|
delete: "Delete repository"
|
||||||
|
modal_rename:
|
||||||
|
title_html: "Rename repository <em>%{name}</em>"
|
||||||
|
name: "New repository name"
|
||||||
|
name_placeholder: "My repository"
|
||||||
|
rename: "Rename repository"
|
||||||
|
modal_create:
|
||||||
|
title: "Create new repository"
|
||||||
|
name_label: "Repository name"
|
||||||
|
name_placeholder: "My repository"
|
||||||
|
submit: "Create repository"
|
||||||
|
success_flash: "Repository <strong>%{name}</strong> successfully created."
|
||||||
nav:
|
nav:
|
||||||
breadcrumbs:
|
breadcrumbs:
|
||||||
repositories: "Repositories"
|
repositories: "Repositories"
|
||||||
|
|
Loading…
Reference in a new issue