Add support for i18n on Project Activity Page
This commit is contained in:
Kushal Pandya
Phil Hughes
parent
934342de78
commit
ee42bfbe88
6 changed files with 170 additions and 18 deletions
|
|
@ -35,18 +35,18 @@ module EventsHelper
|
|||
[event.action_name, target].join(" ")
|
||||
end
|
||||
|
||||
def event_filter_link(key, tooltip)
|
||||
def event_filter_link(key, text, tooltip)
|
||||
key = key.to_s
|
||||
active = 'active' if @event_filter.active?(key)
|
||||
link_opts = {
|
||||
class: "event-filter-link",
|
||||
class: "event-filter-link has-tooltip",
|
||||
id: "#{key}_event_filter",
|
||||
title: "Filter by #{tooltip.downcase}"
|
||||
title: tooltip
|
||||
}
|
||||
|
||||
content_tag :li, class: active do
|
||||
link_to request.path, link_opts do
|
||||
content_tag(:span, ' ' + tooltip)
|
||||
content_tag(:span, ' ' + text)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
%div{ class: container_class }
|
||||
.nav-block.activity-filter-block.activities
|
||||
.controls
|
||||
= link_to project_path(@project, rss_url_options), title: "Subscribe", class: 'btn rss-btn has-tooltip' do
|
||||
= link_to project_path(@project, rss_url_options), title: s_("ProjectActivityRSS|Subscribe"), class: 'btn rss-btn has-tooltip' do
|
||||
= icon('rss')
|
||||
|
||||
= render 'shared/event_filter'
|
||||
|
|
|
|||
|
|
@ -3,16 +3,16 @@
|
|||
.row-content-block.top-block.hidden-xs.white
|
||||
.event-last-push
|
||||
.event-last-push-text
|
||||
%span You pushed to
|
||||
%span= s_("LastPushEvent|You pushed to")
|
||||
%strong
|
||||
= link_to event.ref_name, project_commits_path(event.project, event.ref_name), class: 'ref-name'
|
||||
|
||||
- if event.project != @project
|
||||
%span at
|
||||
%span= s_("LastPushEvent|at")
|
||||
%strong= link_to_project event.project
|
||||
|
||||
#{time_ago_with_tooltip(event.created_at)}
|
||||
|
||||
.pull-right
|
||||
= link_to new_mr_path_from_push_event(event), title: "New merge request", class: "btn btn-info btn-sm" do
|
||||
= link_to new_mr_path_from_push_event(event), title: _("New merge request"), class: "btn btn-info btn-sm" do
|
||||
#{ _('Create merge request') }
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
- @no_container = true
|
||||
|
||||
- if show_new_nav?
|
||||
- add_to_breadcrumbs("Project", project_path(@project))
|
||||
- add_to_breadcrumbs(_("Project"), project_path(@project))
|
||||
|
||||
- page_title "Activity"
|
||||
- page_title _("Activity")
|
||||
= render "projects/head"
|
||||
|
||||
= render 'projects/last_push'
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
%ul.nav-links.event-filter.scrolling-tabs
|
||||
= event_filter_link EventFilter.all, 'All'
|
||||
= event_filter_link EventFilter.all, _('All'), s_('EventFilterBy|Filter by all')
|
||||
- if event_filter_visible(:repository)
|
||||
= event_filter_link EventFilter.push, 'Push events'
|
||||
= event_filter_link EventFilter.push, _('Push events'), s_('EventFilterBy|Filter by push events')
|
||||
- if event_filter_visible(:merge_requests)
|
||||
= event_filter_link EventFilter.merged, 'Merge events'
|
||||
= event_filter_link EventFilter.merged, _('Merge events'), s_('EventFilterBy|Filter by merge events')
|
||||
- if event_filter_visible(:issues)
|
||||
= event_filter_link EventFilter.issue, 'Issue events'
|
||||
= event_filter_link EventFilter.issue, _('Issue events'), s_('EventFilterBy|Filter by issue events')
|
||||
- if comments_visible?
|
||||
= event_filter_link EventFilter.comments, 'Comments'
|
||||
= event_filter_link EventFilter.team, 'Team'
|
||||
= event_filter_link EventFilter.comments, _('Comments'), s_('EventFilterBy|Filter by comments')
|
||||
= event_filter_link EventFilter.team, _('Team'), s_('EventFilterBy|Filter by team')
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: gitlab 1.0.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2017-07-13 12:07-0500\n"
|
||||
"PO-Revision-Date: 2017-07-13 12:07-0500\n"
|
||||
"POT-Creation-Date: 2017-08-18 14:15+0530\n"
|
||||
"PO-Revision-Date: 2017-08-18 14:15+0530\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: \n"
|
||||
|
|
@ -31,6 +31,23 @@ msgstr[1] ""
|
|||
msgid "%{commit_author_link} committed %{commit_timeago}"
|
||||
msgstr ""
|
||||
|
||||
msgid "%{number_of_failures} of %{maximum_failures} failures. GitLab will allow access on the next attempt."
|
||||
msgstr ""
|
||||
|
||||
msgid "%{number_of_failures} of %{maximum_failures} failures. GitLab will block access for %{number_of_seconds} seconds."
|
||||
msgstr ""
|
||||
|
||||
msgid "%{number_of_failures} of %{maximum_failures} failures. GitLab will not retry automatically. Reset storage information when the problem is resolved."
|
||||
msgstr ""
|
||||
|
||||
msgid "%{storage_name}: failed storage access attempt on host:"
|
||||
msgid_plural "%{storage_name}: %{failed_attempts} failed storage access attempts:"
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
msgid "(checkout the %{link} for information on how to install it)."
|
||||
msgstr ""
|
||||
|
||||
msgid "1 pipeline"
|
||||
msgid_plural "%d pipelines"
|
||||
msgstr[0] ""
|
||||
|
|
@ -42,6 +59,9 @@ msgstr ""
|
|||
msgid "About auto deploy"
|
||||
msgstr ""
|
||||
|
||||
msgid "Access to failing storages has been temporarily disabled to allow the mount to recover. Reset storage information after the issue has been resolved to allow access again."
|
||||
msgstr ""
|
||||
|
||||
msgid "Active"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -63,12 +83,27 @@ msgstr ""
|
|||
msgid "Add new directory"
|
||||
msgstr ""
|
||||
|
||||
msgid "All"
|
||||
msgstr ""
|
||||
|
||||
msgid "Archived project! Repository is read-only"
|
||||
msgstr ""
|
||||
|
||||
msgid "Are you sure you want to delete this pipeline schedule?"
|
||||
msgstr ""
|
||||
|
||||
msgid "Are you sure you want to discard your changes?"
|
||||
msgstr ""
|
||||
|
||||
msgid "Are you sure you want to reset registration token?"
|
||||
msgstr ""
|
||||
|
||||
msgid "Are you sure you want to reset the health check token?"
|
||||
msgstr ""
|
||||
|
||||
msgid "Are you sure?"
|
||||
msgstr ""
|
||||
|
||||
msgid "Attach a file by drag & drop or %{upload_link}"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -110,6 +145,9 @@ msgstr ""
|
|||
msgid "Cancel"
|
||||
msgstr ""
|
||||
|
||||
msgid "Cancel edit"
|
||||
msgstr ""
|
||||
|
||||
msgid "ChangeTypeActionLabel|Pick into branch"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -188,6 +226,9 @@ msgstr ""
|
|||
msgid "CiStatus|running"
|
||||
msgstr ""
|
||||
|
||||
msgid "Comments"
|
||||
msgstr ""
|
||||
|
||||
msgid "Commit"
|
||||
msgid_plural "Commits"
|
||||
msgstr[0] ""
|
||||
|
|
@ -235,6 +276,9 @@ msgstr ""
|
|||
msgid "Create New Directory"
|
||||
msgstr ""
|
||||
|
||||
msgid "Create a new branch"
|
||||
msgstr ""
|
||||
|
||||
msgid "Create a personal access token on your account to pull or push via %{protocol}."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -312,9 +356,15 @@ msgstr[1] ""
|
|||
msgid "Description"
|
||||
msgstr ""
|
||||
|
||||
msgid "Details"
|
||||
msgstr ""
|
||||
|
||||
msgid "Directory name"
|
||||
msgstr ""
|
||||
|
||||
msgid "Discard changes"
|
||||
msgstr ""
|
||||
|
||||
msgid "Don't show again"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -351,6 +401,24 @@ msgstr ""
|
|||
msgid "Edit Pipeline Schedule %{id}"
|
||||
msgstr ""
|
||||
|
||||
msgid "EventFilterBy|Filter by all"
|
||||
msgstr ""
|
||||
|
||||
msgid "EventFilterBy|Filter by comments"
|
||||
msgstr ""
|
||||
|
||||
msgid "EventFilterBy|Filter by issue events"
|
||||
msgstr ""
|
||||
|
||||
msgid "EventFilterBy|Filter by merge events"
|
||||
msgstr ""
|
||||
|
||||
msgid "EventFilterBy|Filter by push events"
|
||||
msgstr ""
|
||||
|
||||
msgid "EventFilterBy|Filter by team"
|
||||
msgstr ""
|
||||
|
||||
msgid "Every day (at 4:00am)"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -398,12 +466,36 @@ msgstr ""
|
|||
msgid "From merge request merge until deploy to production"
|
||||
msgstr ""
|
||||
|
||||
msgid "Git storage health information has been reset"
|
||||
msgstr ""
|
||||
|
||||
msgid "GitLab Runner section"
|
||||
msgstr ""
|
||||
|
||||
msgid "Go to your fork"
|
||||
msgstr ""
|
||||
|
||||
msgid "GoToYourFork|Fork"
|
||||
msgstr ""
|
||||
|
||||
msgid "Health Check"
|
||||
msgstr ""
|
||||
|
||||
msgid "Health information can be retrieved from the following endpoints. More information is available"
|
||||
msgstr ""
|
||||
|
||||
msgid "HealthCheck|Access token is"
|
||||
msgstr ""
|
||||
|
||||
msgid "HealthCheck|Healthy"
|
||||
msgstr ""
|
||||
|
||||
msgid "HealthCheck|No Health Problems Detected"
|
||||
msgstr ""
|
||||
|
||||
msgid "HealthCheck|Unhealthy"
|
||||
msgstr ""
|
||||
|
||||
msgid "Home"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -413,12 +505,18 @@ msgstr ""
|
|||
msgid "Import repository"
|
||||
msgstr ""
|
||||
|
||||
msgid "Install a Runner compatible with GitLab CI"
|
||||
msgstr ""
|
||||
|
||||
msgid "Interval Pattern"
|
||||
msgstr ""
|
||||
|
||||
msgid "Introducing Cycle Analytics"
|
||||
msgstr ""
|
||||
|
||||
msgid "Issue events"
|
||||
msgstr ""
|
||||
|
||||
msgid "Jobs for last month"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -448,6 +546,12 @@ msgstr ""
|
|||
msgid "Last commit"
|
||||
msgstr ""
|
||||
|
||||
msgid "LastPushEvent|You pushed to"
|
||||
msgstr ""
|
||||
|
||||
msgid "LastPushEvent|at"
|
||||
msgstr ""
|
||||
|
||||
msgid "Learn more in the"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -468,9 +572,15 @@ msgstr[1] ""
|
|||
msgid "Median"
|
||||
msgstr ""
|
||||
|
||||
msgid "Merge events"
|
||||
msgstr ""
|
||||
|
||||
msgid "MissingSSHKeyWarningLink|add an SSH key"
|
||||
msgstr ""
|
||||
|
||||
msgid "More information is available|here"
|
||||
msgstr ""
|
||||
|
||||
msgid "New Issue"
|
||||
msgid_plural "New Issues"
|
||||
msgstr[0] ""
|
||||
|
|
@ -668,6 +778,9 @@ msgstr ""
|
|||
msgid "Pipeline|with stages"
|
||||
msgstr ""
|
||||
|
||||
msgid "Project"
|
||||
msgstr ""
|
||||
|
||||
msgid "Project '%{project_name}' queued for deletion."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -683,6 +796,9 @@ msgstr ""
|
|||
msgid "Project access must be granted explicitly to each user."
|
||||
msgstr ""
|
||||
|
||||
msgid "Project details"
|
||||
msgstr ""
|
||||
|
||||
msgid "Project export could not be deleted."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -698,6 +814,9 @@ msgstr ""
|
|||
msgid "Project home"
|
||||
msgstr ""
|
||||
|
||||
msgid "ProjectActivityRSS|Subscribe"
|
||||
msgstr ""
|
||||
|
||||
msgid "ProjectFeature|Disabled"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -719,6 +838,9 @@ msgstr ""
|
|||
msgid "ProjectNetworkGraph|Graph"
|
||||
msgstr ""
|
||||
|
||||
msgid "Push events"
|
||||
msgstr ""
|
||||
|
||||
msgid "Read more"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -755,9 +877,21 @@ msgstr ""
|
|||
msgid "Remove project"
|
||||
msgstr ""
|
||||
|
||||
msgid "Repository"
|
||||
msgstr ""
|
||||
|
||||
msgid "Request Access"
|
||||
msgstr ""
|
||||
|
||||
msgid "Reset git storage health information"
|
||||
msgstr ""
|
||||
|
||||
msgid "Reset health check access token"
|
||||
msgstr ""
|
||||
|
||||
msgid "Reset runners registration token"
|
||||
msgstr ""
|
||||
|
||||
msgid "Revert this commit"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -782,6 +916,9 @@ msgstr ""
|
|||
msgid "Select a timezone"
|
||||
msgstr ""
|
||||
|
||||
msgid "Select existing branch"
|
||||
msgstr ""
|
||||
|
||||
msgid "Select target branch"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -808,12 +945,18 @@ msgstr[1] ""
|
|||
msgid "Source code"
|
||||
msgstr ""
|
||||
|
||||
msgid "Specify the following URL during the Runner setup:"
|
||||
msgstr ""
|
||||
|
||||
msgid "StarProject|Star"
|
||||
msgstr ""
|
||||
|
||||
msgid "Start a %{new_merge_request} with these changes"
|
||||
msgstr ""
|
||||
|
||||
msgid "Start the Runner!"
|
||||
msgstr ""
|
||||
|
||||
msgid "Switch branch/tag"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -828,6 +971,9 @@ msgstr ""
|
|||
msgid "Target Branch"
|
||||
msgstr ""
|
||||
|
||||
msgid "Team"
|
||||
msgstr ""
|
||||
|
||||
msgid "The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -876,6 +1022,9 @@ msgstr ""
|
|||
msgid "The value lying at the midpoint of a series of observed values. E.g., between 3, 5, 9, the median is 5. Between 3, 5, 7, 8, the median is (5+7)/2 = 6."
|
||||
msgstr ""
|
||||
|
||||
msgid "There are problems accessing Git storage: "
|
||||
msgstr ""
|
||||
|
||||
msgid "This means you can not push code until you create an empty repository or import existing one."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1045,6 +1194,9 @@ msgstr ""
|
|||
msgid "UploadLink|click to upload"
|
||||
msgstr ""
|
||||
|
||||
msgid "Use the following registration token during setup:"
|
||||
msgstr ""
|
||||
|
||||
msgid "Use your global notification setting"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue