Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
diaspora
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Gigadoc 2
diaspora
Commits
8f27e8fa
Commit
8f27e8fa
authored
Jul 21, 2015
by
Steffen van Bergerem
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve wording for admin dashboard
parent
dbbaf90c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
config/locales/diaspora/en.yml
config/locales/diaspora/en.yml
+1
-1
config/locales/javascript/javascript.en.yml
config/locales/javascript/javascript.en.yml
+1
-1
spec/javascripts/app/pages/admin_dashboard_spec.js
spec/javascripts/app/pages/admin_dashboard_spec.js
+2
-2
No files found.
config/locales/diaspora/en.yml
View file @
8f27e8fa
...
@@ -107,7 +107,7 @@ en:
...
@@ -107,7 +107,7 @@ en:
sidekiq_monitor
:
"
Sidekiq
monitor"
sidekiq_monitor
:
"
Sidekiq
monitor"
dashboard
:
dashboard
:
pod_status
:
"
Pod
status"
pod_status
:
"
Pod
status"
fetching_diaspora_version
:
"
Fetching
curren
t
diaspora*
version..."
fetching_diaspora_version
:
"
Determining
lates
t
diaspora*
version..."
correlations
:
correlations
:
correlations_count
:
"
Correlations
with
sign-in
count:"
correlations_count
:
"
Correlations
with
sign-in
count:"
user_search
:
user_search
:
...
...
config/locales/javascript/javascript.en.yml
View file @
8f27e8fa
...
@@ -34,7 +34,7 @@ en:
...
@@ -34,7 +34,7 @@ en:
up_to_date
:
"
Your
pod
is
up
to
date!"
up_to_date
:
"
Your
pod
is
up
to
date!"
outdated
:
"
Your
pod
is
outdated."
outdated
:
"
Your
pod
is
outdated."
compare_versions
:
"
The
latest
diaspora*
release
is
<%=
latestVersion
%>,
your
pod
is
running
<%=
podVersion
%>."
compare_versions
:
"
The
latest
diaspora*
release
is
<%=
latestVersion
%>,
your
pod
is
running
<%=
podVersion
%>."
error
:
"
Error
fetching
th
e
latest
diaspora*
version."
error
:
"
Unable
to
determin
e
latest
diaspora*
version."
aspects
:
aspects
:
make_aspect_list_visible
:
"
Make
contacts
in
this
aspect
visible
to
each
other?"
make_aspect_list_visible
:
"
Make
contacts
in
this
aspect
visible
to
each
other?"
...
...
spec/javascripts/app/pages/admin_dashboard_spec.js
View file @
8f27e8fa
...
@@ -11,7 +11,7 @@ describe("app.pages.AdminDashboard", function(){
...
@@ -11,7 +11,7 @@ describe("app.pages.AdminDashboard", function(){
up_to_date
:
"
Your pod is up to date!
"
,
up_to_date
:
"
Your pod is up to date!
"
,
outdated
:
"
Your pod is outdated.
"
,
outdated
:
"
Your pod is outdated.
"
,
compare_versions
:
"
Latest d* release is <%= latestVersion%>, your pod is running <%= podVersion %>.
"
,
compare_versions
:
"
Latest d* release is <%= latestVersion%>, your pod is running <%= podVersion %>.
"
,
error
:
"
Error fetching th
e latest diaspora* version.
"
error
:
"
Unable to determin
e latest diaspora* version.
"
}
}
}
}
});
});
...
@@ -173,7 +173,7 @@ describe("app.pages.AdminDashboard", function(){
...
@@ -173,7 +173,7 @@ describe("app.pages.AdminDashboard", function(){
it
(
"
adds a 'warning' alert
"
,
function
()
{
it
(
"
adds a 'warning' alert
"
,
function
()
{
this
.
view
.
updatePodStatusFail
();
this
.
view
.
updatePodStatusFail
();
expect
(
$
(
"
#pod-status .alert
"
)).
toHaveClass
(
"
alert-warning
"
);
expect
(
$
(
"
#pod-status .alert
"
)).
toHaveClass
(
"
alert-warning
"
);
expect
(
$
(
"
#pod-status .alert
"
).
text
()).
toContain
(
"
Error
"
);
expect
(
$
(
"
#pod-status .alert
"
).
text
()).
toContain
(
"
Unable to determine
"
);
});
});
});
});
});
});
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