Commit 4b552edb authored by Sytse Sijbrandij's avatar Sytse Sijbrandij

Merge branch 'sort-wording' into 'master'

Improve english wording in UI filters

Fixes #1664

See merge request !1298
parents 23674100 6670c994
module SortingHelper
def sort_title_oldest_updated
'Oldest updated'
end
def sort_title_recently_updated
'Recently updated'
end
def sort_title_oldest_created
'Oldest created'
end
def sort_title_recently_created
'Recently created'
end
end
...@@ -56,13 +56,13 @@ ...@@ -56,13 +56,13 @@
= link_to admin_projects_path(sort: nil) do = link_to admin_projects_path(sort: nil) do
Name Name
= link_to admin_projects_path(sort: 'newest') do = link_to admin_projects_path(sort: 'newest') do
Newest = sort_title_recently_created
= link_to admin_projects_path(sort: 'oldest') do = link_to admin_projects_path(sort: 'oldest') do
Oldest = sort_title_oldest_created
= link_to admin_projects_path(sort: 'recently_updated') do = link_to admin_projects_path(sort: 'recently_updated') do
Recently updated = sort_title_recently_updated
= link_to admin_projects_path(sort: 'last_updated') do = link_to admin_projects_path(sort: 'last_updated') do
Last updated = sort_title_oldest_updated
= link_to admin_projects_path(sort: 'largest_repository') do = link_to admin_projects_path(sort: 'largest_repository') do
Largest repository Largest repository
= link_to 'New Project', new_project_path, class: "btn btn-new" = link_to 'New Project', new_project_path, class: "btn btn-new"
......
...@@ -49,9 +49,10 @@ ...@@ -49,9 +49,10 @@
= link_to admin_users_path(sort: 'oldest_sign_in') do = link_to admin_users_path(sort: 'oldest_sign_in') do
Oldest sign in Oldest sign in
= link_to admin_users_path(sort: 'recently_created') do = link_to admin_users_path(sort: 'recently_created') do
Recently created = sort_title_recently_created
= link_to admin_users_path(sort: 'late_created') do = link_to admin_users_path(sort: 'late_created') do
Late created = sort_title_oldest_created
= link_to 'New User', new_admin_user_path, class: "btn btn-new" = link_to 'New User', new_admin_user_path, class: "btn btn-new"
%ul.well-list %ul.well-list
- @users.each do |user| - @users.each do |user|
......
...@@ -14,13 +14,14 @@ ...@@ -14,13 +14,14 @@
= link_to projects_dashboard_filter_path(sort: nil) do = link_to projects_dashboard_filter_path(sort: nil) do
Name Name
= link_to projects_dashboard_filter_path(sort: 'newest') do = link_to projects_dashboard_filter_path(sort: 'newest') do
Newest = sort_title_recently_created
= link_to projects_dashboard_filter_path(sort: 'oldest') do = link_to projects_dashboard_filter_path(sort: 'oldest') do
Oldest = sort_title_oldest_created
= link_to projects_dashboard_filter_path(sort: 'recently_updated') do = link_to projects_dashboard_filter_path(sort: 'recently_updated') do
Recently updated = sort_title_recently_updated
= link_to projects_dashboard_filter_path(sort: 'last_updated') do = link_to projects_dashboard_filter_path(sort: 'last_updated') do
Last updated = sort_title_oldest_updated
%p.light %p.light
All projects you have access to are listed here. Public projects are not included here unless you are a member All projects you have access to are listed here. Public projects are not included here unless you are a member
%hr %hr
......
...@@ -20,13 +20,13 @@ ...@@ -20,13 +20,13 @@
= link_to explore_groups_path(sort: nil) do = link_to explore_groups_path(sort: nil) do
Name Name
= link_to explore_groups_path(sort: 'newest') do = link_to explore_groups_path(sort: 'newest') do
Newest = sort_title_recently_created
= link_to explore_groups_path(sort: 'oldest') do = link_to explore_groups_path(sort: 'oldest') do
Oldest = sort_title_oldest_created
= link_to explore_groups_path(sort: 'recently_updated') do = link_to explore_groups_path(sort: 'recently_updated') do
Recently updated = sort_title_recently_updated
= link_to explore_groups_path(sort: 'last_updated') do = link_to explore_groups_path(sort: 'last_updated') do
Last updated = sort_title_oldest_updated
%hr %hr
......
...@@ -20,13 +20,13 @@ ...@@ -20,13 +20,13 @@
= link_to explore_projects_path(sort: nil) do = link_to explore_projects_path(sort: nil) do
Name Name
= link_to explore_projects_path(sort: 'newest') do = link_to explore_projects_path(sort: 'newest') do
Newest = sort_title_recently_created
= link_to explore_projects_path(sort: 'oldest') do = link_to explore_projects_path(sort: 'oldest') do
Oldest = sort_title_oldest_created
= link_to explore_projects_path(sort: 'recently_updated') do = link_to explore_projects_path(sort: 'recently_updated') do
Recently updated = sort_title_recently_updated
= link_to explore_projects_path(sort: 'last_updated') do = link_to explore_projects_path(sort: 'last_updated') do
Last updated = sort_title_oldest_updated
%hr %hr
.public-projects .public-projects
......
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
= link_to project_branches_path(sort: nil) do = link_to project_branches_path(sort: nil) do
Name Name
= link_to project_branches_path(sort: 'recently_updated') do = link_to project_branches_path(sort: 'recently_updated') do
Recently updated = sort_title_recently_updated
= link_to project_branches_path(sort: 'last_updated') do = link_to project_branches_path(sort: 'last_updated') do
Last updated = sort_title_oldest_updated
%hr %hr
- unless @branches.empty? - unless @branches.empty?
%ul.bordered-list.top-list.all-branches %ul.bordered-list.top-list.all-branches
......
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
%ul.dropdown-menu %ul.dropdown-menu
%li %li
= link_to project_filter_path(sort: 'newest') do = link_to project_filter_path(sort: 'newest') do
Newest = sort_title_recently_created
= link_to project_filter_path(sort: 'oldest') do = link_to project_filter_path(sort: 'oldest') do
Oldest = sort_title_oldest_created
= link_to project_filter_path(sort: 'recently_updated') do = link_to project_filter_path(sort: 'recently_updated') do
Recently updated = sort_title_recently_updated
= link_to project_filter_path(sort: 'last_updated') do = link_to project_filter_path(sort: 'last_updated') do
Last updated = sort_title_oldest_updated
= link_to project_filter_path(sort: 'milestone_due_soon') do = link_to project_filter_path(sort: 'milestone_due_soon') do
Milestone due soon Milestone due soon
= link_to project_filter_path(sort: 'milestone_due_later') do = link_to project_filter_path(sort: 'milestone_due_later') do
......
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