Commit 99ee6c82 authored by Lin Jen-Shin's avatar Lin Jen-Shin
Browse files

Merge branch 'twang2218/gitlab-ce-i18n-extract-app/views/search' into 'master'

i18n: externalize strings from 'app/views/search'

See merge request gitlab-org/gitlab-ce!24297
parents 267ce96e 527ded1e
......@@ -6,75 +6,75 @@
- if project_search_tabs?(:blobs)
%li{ class: active_when(@scope == 'blobs') }
= link_to search_filter_path(scope: 'blobs') do
Code
= _("Code")
%span.badge.badge-pill
= @search_results.blobs_count
- if project_search_tabs?(:issues)
%li{ class: active_when(@scope == 'issues') }
= link_to search_filter_path(scope: 'issues') do
Issues
= _("Issues")
%span.badge.badge-pill
= limited_count(@search_results.limited_issues_count)
- if project_search_tabs?(:merge_requests)
%li{ class: active_when(@scope == 'merge_requests') }
= link_to search_filter_path(scope: 'merge_requests') do
Merge requests
= _("Merge requests")
%span.badge.badge-pill
= limited_count(@search_results.limited_merge_requests_count)
- if project_search_tabs?(:milestones)
%li{ class: active_when(@scope == 'milestones') }
= link_to search_filter_path(scope: 'milestones') do
Milestones
= _("Milestones")
%span.badge.badge-pill
= limited_count(@search_results.limited_milestones_count)
- if project_search_tabs?(:notes)
%li{ class: active_when(@scope == 'notes') }
= link_to search_filter_path(scope: 'notes') do
Comments
= _("Comments")
%span.badge.badge-pill
= limited_count(@search_results.limited_notes_count)
- if project_search_tabs?(:wiki)
%li{ class: active_when(@scope == 'wiki_blobs') }
= link_to search_filter_path(scope: 'wiki_blobs') do
Wiki
= _("Wiki")
%span.badge.badge-pill
= @search_results.wiki_blobs_count
- if project_search_tabs?(:commits)
%li{ class: active_when(@scope == 'commits') }
= link_to search_filter_path(scope: 'commits') do
Commits
= _("Commits")
%span.badge.badge-pill
= @search_results.commits_count
- elsif @show_snippets
%li{ class: active_when(@scope == 'snippet_blobs') }
= link_to search_filter_path(scope: 'snippet_blobs', snippets: true, group_id: nil, project_id: nil) do
Snippet Contents
= _("Snippet Contents")
%span.badge.badge-pill
= @search_results.snippet_blobs_count
%li{ class: active_when(@scope == 'snippet_titles') }
= link_to search_filter_path(scope: 'snippet_titles', snippets: true, group_id: nil, project_id: nil) do
Titles and Filenames
= _("Titles and Filenames")
%span.badge.badge-pill
= @search_results.snippet_titles_count
- else
%li{ class: active_when(@scope == 'projects') }
= link_to search_filter_path(scope: 'projects') do
Projects
= _("Projects")
%span.badge.badge-pill
= limited_count(@search_results.limited_projects_count)
%li{ class: active_when(@scope == 'issues') }
= link_to search_filter_path(scope: 'issues') do
Issues
= _("Issues")
%span.badge.badge-pill
= limited_count(@search_results.limited_issues_count)
%li{ class: active_when(@scope == 'merge_requests') }
= link_to search_filter_path(scope: 'merge_requests') do
Merge requests
= _("Merge requests")
%span.badge.badge-pill
= limited_count(@search_results.limited_merge_requests_count)
%li{ class: active_when(@scope == 'milestones') }
= link_to search_filter_path(scope: 'milestones') do
Milestones
= _("Milestones")
%span.badge.badge-pill
= limited_count(@search_results.limited_milestones_count)
......@@ -3,31 +3,31 @@
- if params[:project_id].present?
= hidden_field_tag :project_id, params[:project_id]
.dropdown
%button.dropdown-menu-toggle.js-search-group-dropdown{ type: "button", data: { toggle: "dropdown", default_label: "Group:", group_id: params[:group_id] } }
%button.dropdown-menu-toggle.js-search-group-dropdown{ type: "button", data: { toggle: "dropdown", default_label: _('Group:'), group_id: params[:group_id] } }
%span.dropdown-toggle-text
Group:
= _("Group:")
- if @group.present?
= @group.name
- else
Any
= _("Any")
= icon("chevron-down")
.dropdown-menu.dropdown-select.dropdown-menu-selectable.dropdown-menu-right
= dropdown_title("Filter results by group")
= dropdown_filter("Search groups")
= dropdown_title(_("Filter results by group"))
= dropdown_filter(_("Search groups"))
= dropdown_content
= dropdown_loading
.dropdown.project-filter
%button.dropdown-menu-toggle.js-search-project-dropdown{ type: "button", data: { toggle: "dropdown", default_label: "Project:" } }
%button.dropdown-menu-toggle.js-search-project-dropdown{ type: "button", data: { toggle: "dropdown", default_label: _('Project:') } }
%span.dropdown-toggle-text
Project:
= _("Project:")
- if @project.present?
= @project.full_name
- else
Any
= _("Any")
= icon("chevron-down")
.dropdown-menu.dropdown-select.dropdown-menu-selectable.dropdown-menu-right
= dropdown_title("Filter results by project")
= dropdown_filter("Search projects")
= dropdown_title(_("Filter results by project"))
= dropdown_filter(_("Search projects"))
= dropdown_content
= dropdown_loading
......@@ -4,12 +4,12 @@
.search-holder
.search-field-holder
= search_field_tag :search, params[:search], placeholder: "Search for projects, issues etc", class: "form-control search-text-input js-search-input", id: "dashboard_search", autofocus: true, spellcheck: false
= search_field_tag :search, params[:search], placeholder: _("Search for projects, issues, etc."), class: "form-control search-text-input js-search-input", id: "dashboard_search", autofocus: true, spellcheck: false
= icon("search", class: "search-icon")
%button.search-clear.js-search-clear{ class: ("hidden" if !params[:search].present?), type: "button", tabindex: "-1" }
= icon("times-circle")
%span.sr-only
Clear search
= _("Clear search")
- unless params[:snippets].eql? 'true'
= render 'filter'
= button_tag "Search", class: "btn btn-success btn-search"
= button_tag _("Search"), class: "btn btn-success btn-search"
......@@ -6,9 +6,11 @@
= search_entries_info(@search_objects, @scope, @search_term)
- unless @show_snippets
- if @project
in project #{link_to @project.full_name, [@project.namespace.becomes(Namespace), @project]}
- link_to_project = link_to(@project.full_name, [@project.namespace.becomes(Namespace), @project])
= _("in project %{link_to_project}").html_safe % { link_to_project: link_to_project }
- elsif @group
in group #{link_to @group.name, @group}
- link_to_group = link_to(@group.name, @group)
= _("in group %{link_to_group}").html_safe % { link_to_group: link_to_group }
.results.prepend-top-10
- if @scope == 'commits'
......
......@@ -2,5 +2,5 @@
.search_glyph
%h4
= icon('search')
We couldn't find any results matching
= _("We couldn't find any results matching")
%code= @search_term
......@@ -4,7 +4,7 @@
= link_to [issue.project.namespace.becomes(Namespace), issue.project, issue] do
%span.term.str-truncated= issue.title
- if issue.closed?
%span.badge.badge-danger.prepend-left-5 Closed
%span.badge.badge-danger.prepend-left-5= _("Closed")
.float-right ##{issue.iid}
- if issue.description.present?
.description.term
......
......@@ -3,9 +3,9 @@
= link_to [merge_request.target_project.namespace.becomes(Namespace), merge_request.target_project, merge_request] do
%span.term.str-truncated= merge_request.title
- if merge_request.merged?
%span.badge.badge-primary.prepend-left-5 Merged
%span.badge.badge-primary.prepend-left-5= _("Merged")
- elsif merge_request.closed?
%span.badge.badge-danger.prepend-left-5 Closed
%span.badge.badge-danger.prepend-left-5= _("Closed")
.float-right= merge_request.to_reference
- if merge_request.description.present?
.description.term
......
......@@ -6,14 +6,14 @@
%h5.note-search-caption.str-truncated
%i.fa.fa-comment
= link_to_member(project, note.author, avatar: false)
commented on
= link_to project.full_name, project
- link_to_project = link_to(project.full_name, project)
= _("commented on %{link_to_project}").html_safe % { link_to_project: link_to_project }
·
- if note.for_commit?
= link_to_if(noteable_identifier, "Commit #{truncate_sha(note.commit_id)}", note_url) do
= link_to_if(noteable_identifier, _("Commit %{commit_id}") % { commit_id: truncate_sha(note.commit_id) }, note_url) do
= truncate_sha(note.commit_id)
%span.light Commit deleted
%span.light= _("Commit deleted")
- else
%span #{note.noteable_type.titleize} ##{noteable_identifier}
......
......@@ -24,7 +24,7 @@
= markup(snippet.file_name, chunk[:data], legacy_render_context(params))
- else
.file-content.code
.nothing-here-block Empty file
.nothing-here-block= _("Empty file")
- else
.file-content.code.js-syntax-highlight
.line-numbers
......@@ -42,4 +42,4 @@
= highlight(snippet.file_name, chunk[:data])
- else
.file-content.code
.nothing-here-block Empty file
.nothing-here-block= _("Empty file")
......@@ -5,7 +5,7 @@
- if snippet_title.private?
%span.badge.badge-gray
%i.fa.fa-lock
private
= _("private")
%span.cgray.monospace.tiny.float-right.term
= snippet_title.file_name
......
- @hide_top_links = true
- breadcrumb_title "Search"
- breadcrumb_title _("Search")
- page_title @search_term
.prepend-top-default
......
---
title: 'i18n: externalize strings from ''app/views/search'''
merge_request: 24297
author: Tao Wang
type: other
......@@ -1899,6 +1899,9 @@ msgstr ""
msgid "ClusterIntegration|sign up"
msgstr ""
msgid "Code"
msgstr ""
msgid "Cohorts"
msgstr ""
......@@ -1937,9 +1940,15 @@ msgid_plural "Commits"
msgstr[0] ""
msgstr[1] ""
msgid "Commit %{commit_id}"
msgstr ""
msgid "Commit Message"
msgstr ""
msgid "Commit deleted"
msgstr ""
msgid "Commit duration in minutes for last 30 commits"
msgstr ""
......@@ -3151,6 +3160,12 @@ msgstr ""
msgid "Filter by two-factor authentication"
msgstr ""
msgid "Filter results by group"
msgstr ""
msgid "Filter results by project"
msgstr ""
msgid "Filter..."
msgstr ""
......@@ -3415,6 +3430,9 @@ msgstr ""
msgid "Group name"
msgstr ""
msgid "Group:"
msgstr ""
msgid "Group: %{group_name}"
msgstr ""
......@@ -5450,6 +5468,9 @@ msgstr ""
msgid "Project slug"
msgstr ""
msgid "Project:"
msgstr ""
msgid "ProjectActivityRSS|Subscribe"
msgstr ""
......@@ -6012,6 +6033,9 @@ msgstr ""
msgid "Search for projects, issues, etc."
msgstr ""
msgid "Search groups"
msgstr ""
msgid "Search merge requests"
msgstr ""
......@@ -6027,6 +6051,9 @@ msgstr ""
msgid "Search project"
msgstr ""
msgid "Search projects"
msgstr ""
msgid "Search users"
msgstr ""
......@@ -6323,6 +6350,9 @@ msgstr ""
msgid "Slower but makes sure the project workspace is pristine as it clones the repository from scratch for every job"
msgstr ""
msgid "Snippet Contents"
msgstr ""
msgid "Snippets"
msgstr ""
......@@ -7269,6 +7299,9 @@ msgstr ""
msgid "Title"
msgstr ""
msgid "Titles and Filenames"
msgstr ""
msgid "To GitLab"
msgstr ""
......@@ -7692,6 +7725,9 @@ msgstr ""
msgid "Want to see the data? Please ask an administrator for access."
msgstr ""
msgid "We couldn't find any results matching"
msgstr ""
msgid "We detected potential spam in the %{humanized_resource_name}. Please solve the reCAPTCHA to proceed."
msgstr ""
......@@ -8097,6 +8133,9 @@ msgstr ""
msgid "command line instructions"
msgstr ""
msgid "commented on %{link_to_project}"
msgstr ""
msgid "confidentiality|You are going to turn off the confidentiality. This means <strong>everyone</strong> will be able to see and leave a comment on this issue."
msgstr ""
......@@ -8170,6 +8209,12 @@ msgstr ""
msgid "importing"
msgstr ""
msgid "in group %{link_to_group}"
msgstr ""
msgid "in project %{link_to_project}"
msgstr ""
msgid "issue boards"
msgstr ""
......@@ -8422,6 +8467,9 @@ msgstr ""
msgid "personal access token"
msgstr ""
msgid "private"
msgstr ""
msgid "project"
msgstr ""
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment