nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6219 from svbergerem/admin-dashboard-improve-wording

Browse source 
Improve wording for admin dashboard
This commit is contained in:
Jonne Haß 2015-07-21 20:45:56 +02:00
commit 2ae1d0215a
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/locales/diaspora/en.yml
View file

@ -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 current diaspora* version..." fetching_diaspora_version: "Determining latest diaspora* version..."
correlations: correlations:
correlations_count: "Correlations with sign-in count:" correlations_count: "Correlations with sign-in count:"
user_search: user_search:

2
config/locales/javascript/javascript.en.yml
View file

@ -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 the latest diaspora* version." error: "Unable to determine 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?"

4
spec/javascripts/app/pages/admin_dashboard_spec.js
View file

@ -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 the latest diaspora* version." error: "Unable to determine latest diaspora* version."
} }
} }
}); });
@ -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");
}); });
}); });
}); });