Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
e3c76e6b
Commit
e3c76e6b
authored
Sep 06, 2017
by
Chris Peressini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change strings for projects dropdown placeholder and error state
gitlab-ce#37513
parent
5d2b7aa2
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
4 deletions
+22
-4
app/assets/javascripts/projects_dropdown/components/projects_list_search.vue
...pts/projects_dropdown/components/projects_list_search.vue
+1
-1
app/assets/javascripts/projects_dropdown/components/search.vue
...ssets/javascripts/projects_dropdown/components/search.vue
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+18
-0
spec/javascripts/projects_dropdown/components/projects_list_search_spec.js
...projects_dropdown/components/projects_list_search_spec.js
+1
-1
spec/javascripts/projects_dropdown/components/search_spec.js
spec/javascripts/projects_dropdown/components/search_spec.js
+1
-1
No files found.
app/assets/javascripts/projects_dropdown/components/projects_list_search.vue
View file @
e3c76e6b
...
@@ -27,7 +27,7 @@ export default {
...
@@ -27,7 +27,7 @@ export default {
listEmptyMessage
()
{
listEmptyMessage
()
{
return
this
.
searchFailed
?
return
this
.
searchFailed
?
s__
(
'
ProjectsDropdown|Something went wrong on our end.
'
)
:
s__
(
'
ProjectsDropdown|Something went wrong on our end.
'
)
:
s__
(
'
ProjectsDropdown|
No projects matched your query
'
);
s__
(
'
ProjectsDropdown|
Sorry, no projects matched your search
'
);
},
},
},
},
};
};
...
...
app/assets/javascripts/projects_dropdown/components/search.vue
View file @
e3c76e6b
...
@@ -53,7 +53,7 @@ export default {
...
@@ -53,7 +53,7 @@ export default {
class=
"form-control"
class=
"form-control"
ref=
"search"
ref=
"search"
v-model=
"searchQuery"
v-model=
"searchQuery"
:placeholder=
"s__('ProjectsDropdown|Search projects')"
:placeholder=
"s__('ProjectsDropdown|Search
your
projects')"
/>
/>
<i
<i
v-if=
"!searchQuery"
v-if=
"!searchQuery"
...
...
locale/gitlab.pot
View file @
e3c76e6b
...
@@ -987,6 +987,24 @@ msgstr ""
...
@@ -987,6 +987,24 @@ msgstr ""
msgid "Push Rules"
msgid "Push Rules"
msgstr ""
msgstr ""
msgid "ProjectsDropdown|Loading projects"
msgstr ""
msgid "ProjectsDropdown|Sorry, no projects matched your search"
msgstr ""
msgid "ProjectsDropdown|Projects you visit often will appear here"
msgstr ""
msgid "ProjectsDropdown|Search your projects"
msgstr ""
msgid "ProjectsDropdown|Something went wrong on our end"
msgstr ""
msgid "ProjectsDropdown|This feature requires browser localStorage support"
msgstr ""
msgid "Push events"
msgid "Push events"
msgstr ""
msgstr ""
...
...
spec/javascripts/projects_dropdown/components/projects_list_search_spec.js
View file @
e3c76e6b
...
@@ -43,7 +43,7 @@ describe('ProjectsListSearchComponent', () => {
...
@@ -43,7 +43,7 @@ describe('ProjectsListSearchComponent', () => {
expect
(
vm
.
listEmptyMessage
).
toBe
(
'
Something went wrong on our end.
'
);
expect
(
vm
.
listEmptyMessage
).
toBe
(
'
Something went wrong on our end.
'
);
vm
.
searchFailed
=
false
;
vm
.
searchFailed
=
false
;
expect
(
vm
.
listEmptyMessage
).
toBe
(
'
No projects matched your query
'
);
expect
(
vm
.
listEmptyMessage
).
toBe
(
'
Sorry, no projects matched your search
'
);
});
});
});
});
});
});
...
...
spec/javascripts/projects_dropdown/components/search_spec.js
View file @
e3c76e6b
...
@@ -94,7 +94,7 @@ describe('SearchComponent', () => {
...
@@ -94,7 +94,7 @@ describe('SearchComponent', () => {
expect
(
vm
.
$el
.
classList
.
contains
(
'
search-input-container
'
)).
toBeTruthy
();
expect
(
vm
.
$el
.
classList
.
contains
(
'
search-input-container
'
)).
toBeTruthy
();
expect
(
vm
.
$el
.
classList
.
contains
(
'
hidden-xs
'
)).
toBeTruthy
();
expect
(
vm
.
$el
.
classList
.
contains
(
'
hidden-xs
'
)).
toBeTruthy
();
expect
(
inputEl
).
not
.
toBe
(
null
);
expect
(
inputEl
).
not
.
toBe
(
null
);
expect
(
inputEl
.
getAttribute
(
'
placeholder
'
)).
toBe
(
'
Search projects
'
);
expect
(
inputEl
.
getAttribute
(
'
placeholder
'
)).
toBe
(
'
Search
your
projects
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.search-icon
'
)).
toBeDefined
();
expect
(
vm
.
$el
.
querySelector
(
'
.search-icon
'
)).
toBeDefined
();
});
});
});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment