[checkmk-commits] Check_MK Git: check_mk: Make view/dashboard permissions l10nable

Module: check_mk Branch: master Commit: 8fdc94d44db6b63daf0515a4835baa4735fb5a78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fdc94d44db6b6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 2 10:55:24 2014 +0200 Make view/dashboard permissions l10nable --- web/htdocs/dashboard.py | 2 +- web/htdocs/default_permissions.py | 23 +++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index ad67e77..e7d8a15 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -86,7 +86,7 @@ def load_plugins(): board.get("description", ""), config.builtin_role_ids) - # Make sure that custom views also have permissions + # Make sure that custom dashboards also have permissions config.declare_dynamic_permissions(lambda: visuals.declare_custom_permissions('dashboards')) def load_dashboards(): diff --git a/web/htdocs/default_permissions.py b/web/htdocs/default_permissions.py index 624788a..bc5ac82 100644 --- a/web/htdocs/default_permissions.py +++ b/web/htdocs/default_permissions.py @@ -35,7 +35,6 @@ loaded_with_language = False # | |_| \___|_| |_| |_| |_|_|___/___/_|\___/|_| |_|___/ | # | | # +----------------------------------------------------------------------+ -# | | # | Declare general permissions for Multisite | # '----------------------------------------------------------------------' @@ -57,8 +56,8 @@ def load(): "If combined with 'perform commands' then commands may be done on all objects."), [ "admin", "guest" ]) - declare_visual_permissions('views') - declare_visual_permissions('dashboards') + declare_visual_permissions('views', _("Views")) + declare_visual_permissions('dashboards', _("Dashboards")) config.declare_permission("general.view_option_columns", _("Change view display columns"), @@ -144,23 +143,23 @@ def load(): loaded_with_language = current_language -def declare_visual_permissions(what): +def declare_visual_permissions(what, what_plural): config.declare_permission("general.edit_" + what, - _("Customize %s and use them") % what, - _("Allows to create own %s, customize builtin %s and use them.") % (what, what), + _("Customize %s and use them") % what_plural, + _("Allows to create own %s, customize builtin %s and use them.") % (what_plural, what_plural), [ "admin", "user" ]) config.declare_permission("general.publish_" + what, - _("Publish %s") % what, - _("Make %s visible and usable for other users") % what, + _("Publish %s") % what_plural, + _("Make %s visible and usable for other users") % what_plural, [ "admin", "user" ]) config.declare_permission("general.see_user_" + what, - _("See user %s") % what, - _("Is needed for seeing %s that other users have created.") % what, + _("See user %s") % what_plural, + _("Is needed for seeing %s that other users have created.") % what_plural, [ "admin", "user", "guest" ]) config.declare_permission("general.force_" + what, - _("Modify builtin %s") % what, - _("Make own published %s override builtin %s for all users.") % (what, what), + _("Modify builtin %s") % what_plural, + _("Make own published %s override builtin %s for all users.") % (what_plural, what_plural), [ "admin" ])