Checkmk git commits May 2011

checkmk-commits@lists.checkmk.com

2 participants
134 discussions

Check_MK Git: check_mk: Added more localization macros

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d5279adb01b533c8f59bf3c92620b74b1f2b95cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5279adb01b533… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 13 18:06:55 2011 +0200 Added more localization macros --- web/plugins/views/painters.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index bb09298..492d548 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -240,7 +240,7 @@ def paint_icons(what, row): # what is "host" or "service" # Flapping if row[prefix + "is_flapping"]: output += '<img class=icon title="%s" src="images/icon_flapping.gif">' % \ - 'This %s is flapping') % what + _('This %s is flapping') % what # Setting of active checks modified by user if "active_checks_enabled" in row[prefix + "modified_attributes_list"]:

13 years, 1 month

Check_MK Git: check_mk: Added more localization macros

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 424e98ac1c9d881ee5d4a13d58f01212d4e21535 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=424e98ac1c9d88… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 13 18:06:02 2011 +0200 Added more localization macros --- web/plugins/sidebar/bi.py | 4 +- web/plugins/sidebar/nagvis_maps.py | 6 ++-- web/plugins/sidebar/search.py | 4 +- web/plugins/sidebar/wato.py | 2 +- web/plugins/views/bi.py | 50 +++++++++++++++----------- web/plugins/views/filters.py | 68 ++++++++++++++++++------------------ web/plugins/views/painters.py | 47 +++++++++++++------------ web/plugins/views/sorters.py | 36 +++++++++--------- web/plugins/views/webservice.py | 2 +- 9 files changed, 113 insertions(+), 106 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=424e98ac1c…

13 years, 1 month

Check_MK Git: check_mk: Prepared for i18n, still most _(...) are missing

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e869f75d12c1e8d0b51c3fe992244a5771a4da96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e869f75d12c1e8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 13 17:30:36 2011 +0200 Prepared for i18n, still most _(...) are missing --- web/htdocs/index.py | 14 ++++++---- web/htdocs/sidebar.py | 54 ++++++++++++++++++++++++++---------------- web/plugins/sidebar/wato.py | 6 +--- 3 files changed, 43 insertions(+), 31 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 3398958..fba1c4d 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. import __builtin__ -__builtin__._ = lambda x: "HIRNI: " + x +__builtin__._ = lambda x: x __builtin__.current_language = None from mod_python import apache, util @@ -158,7 +158,7 @@ def handler(req, profiling = True): config.debug = True # Initialize the multiste i18n - lang = config.default_language + lang = html.var("lang", config.default_language) # Make current language globally known to all of our modules __builtin__.current_language = lang @@ -175,12 +175,14 @@ def handler(req, profiling = True): except IOError, e: raise MKUserError('lang', 'No translation file found for the given language.') else: - __builtin__._ = lambda x: "PASST: " + x + __builtin__._ = lambda x: x # All plugins might have to be reloaded due to a language change - __all_our_fucking_moudles = [ views ] - for module in __all_our_fucking_moudles: - module.load_plugins() + for module in [ views, sidebar, wato, bi]: + try: + module.load_plugins() + except: + pass # profiling can be enabled in multisite.mk diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 465ee5c..45e1f16 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -27,30 +27,40 @@ import config, defaults, livestatus, htmllib, views, pprint, os, copy from lib import * -sidebar_snapins = {} - # Constants to be used in snapins snapin_width = 230 -# Load all snapins -snapins_dir = defaults.web_dir + "/plugins/sidebar" -for fn in os.listdir(snapins_dir): - if fn.endswith(".py"): - execfile(snapins_dir + "/" + fn) -if defaults.omd_root: - local_snapins_dir = defaults.omd_root + "/local/share/check_mk/web/plugins/sidebar" - if os.path.exists(local_snapins_dir): - for fn in os.listdir(local_snapins_dir): - if fn.endswith(".py"): - execfile(local_snapins_dir + "/" + fn) - -# Declare permissions: each snapin creates one permission -config.declare_permission_section("sidesnap", "Sidebar snapins") -for name, snapin in sidebar_snapins.items(): - config.declare_permission("sidesnap.%s" % name, - snapin["title"], - "", - snapin["allowed"]) + +# Datastructures and functions needed before plugins can be loaded +loaded_with_language = False +sidebar_snapins = {} + +def load_plugins(): + if loaded_with_language == current_language: + return + + global loaded_with_language + loaded_with_language = current_language + + # Load all snapins + snapins_dir = defaults.web_dir + "/plugins/sidebar" + for fn in os.listdir(snapins_dir): + if fn.endswith(".py"): + execfile(snapins_dir + "/" + fn, globals()) + if defaults.omd_root: + local_snapins_dir = defaults.omd_root + "/local/share/check_mk/web/plugins/sidebar" + if os.path.exists(local_snapins_dir): + for fn in os.listdir(local_snapins_dir): + if fn.endswith(".py"): + execfile(local_snapins_dir + "/" + fn, globals()) + + # Declare permissions: each snapin creates one permission + config.declare_permission_section("sidesnap", "Sidebar snapins") + for name, snapin in sidebar_snapins.items(): + config.declare_permission("sidesnap.%s" % name, + snapin["title"], + "", + snapin["allowed"]) # Helper functions to be used by snapins def link(text, target): @@ -330,3 +340,5 @@ def page_add_snapin(h): html.write("</tr></table>\n") html.footer() + +load_plugins() diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index ddc95f1..3f27056 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -24,8 +24,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -#!/usr/bin/python - import config, wato def render_wato_files(): @@ -55,8 +53,8 @@ def ajax_wato_files(h): sidebar_snapins["wato"] = { - "title" : "Check_MK Web Administration Tool", - "description" : "WATO - the Web Administration Tool of Check_MK - manage hosts to be monitored without access to the command line", + "title" : _("Check_MK Web Administration Tool"), + "description" : _("WATO - the Web Administration Tool of Check_MK - manage hosts to be monitored without access to the command line"), "author" : "Mathias Kettner", "render" : render_wato_files, "allowed" : [ "admin", "user" ],

13 years, 1 month

Check_MK Git: check_mk: Intermediate step in i18n

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fc7c678e1bdf5f01d7313374678e242318c8882d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc7c678e1bdf5f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 13 17:10:38 2011 +0200 Intermediate step in i18n --- modules/localize.py | 15 ++++ scripts/setup.sh | 6 ++ web/htdocs/config.py | 3 + web/htdocs/index.py | 16 ++++- web/htdocs/views.py | 150 ++++++++++++++++++++++------------------ web/plugins/sidebar/shipped.py | 4 +- web/plugins/views/builtin.py | 2 +- 7 files changed, 123 insertions(+), 73 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fc7c678e1b…

13 years, 1 month

Check_MK Git: check_mk: Make all titles and short descriptions translateble

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5cb8938e9256bb7ddd53b8b7a7b45207ea588309 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cb8938e9256bb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 13 17:13:44 2011 +0200 Make all titles and short descriptions translateble --- web/plugins/views/bi.py | 44 ++-- web/plugins/views/datasources.py | 28 +- web/plugins/views/layouts.py | 8 +- web/plugins/views/painters.py | 570 +++++++++++++++++++------------------- web/plugins/views/perfometer.py | 4 +- web/plugins/views/sorters.py | 6 +- web/plugins/views/webservice.py | 6 +- 7 files changed, 333 insertions(+), 333 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5cb8938e92…

13 years, 1 month

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk into i18n

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: c8f038943449d652bb9e3b1ad7169b709346472b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8f038943449d6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 13 16:03:17 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk into i18n Conflicts: ChangeLog ---

13 years, 1 month

Check_MK Git: check_mk: Introduced basic infrastructure for multilanguage support in Multisite

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 387cc69e1b5b8f0317b991dbfc871823dd805a29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=387cc69e1b5b8f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 13 13:16:50 2011 +0200 Introduced basic infrastructure for multilanguage support in Multisite --- ChangeLog | 4 + modules/check_mk.py | 14 +++- modules/localize.py | 227 +++++++++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/index.py | 59 +++++++++----- web/htdocs/lib.py | 2 +- 5 files changed, 284 insertions(+), 22 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=387cc69e1b…

13 years, 1 month

Check_MK Git: check_mk: language string sniff supports local web dir now

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 01d9476a54bc26f6395facacd11038c6d22d6d49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01d9476a54bc26… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 13 13:19:22 2011 +0200 language string sniff supports local web dir now --- modules/localize.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/modules/localize.py b/modules/localize.py index 464af95..40c1612 100755 --- a/modules/localize.py +++ b/modules/localize.py @@ -138,10 +138,15 @@ def localize_init_po(lang): def localize_sniff(): sys.stdout.write('Sniffing source code...\n') + if local_web_dir and os.path.exists(local_web_dir): + paths = web_dir + ' ' + local_web_dir + else: + paths = web_dir + if os.system('xgettext --no-wrap --sort-output --force-po ' '-L Python --from-code=utf-8 --omit-header ' '-o %s $(find %s -type f -name \*.py | xargs) >/dev/null' % \ - (pot_file, web_dir)) != 0: + (pot_file, paths)) != 0: sys.stderr.write('Failed!\n') else: header = '''# +------------------------------------------------------------------+

13 years, 1 month

Check_MK Git: check_mk: Started adding function for localizing

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6ca82fd128794639a30e5ddc47c047e3365fcda6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ca82fd1287946… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 13 16:02:24 2011 +0200 Started adding function for localizing --- web/htdocs/index.py | 6 +- web/plugins/sidebar/shipped.py | 136 +++++++++++++++++++------------------- web/plugins/views/datasources.py | 2 +- 3 files changed, 73 insertions(+), 71 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6ca82fd128…

13 years, 1 month

Check_MK Git: check_mk: Improved .f12 compile helper, touch .py files

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c7e7b2b227303e7c43e99dc74e8c69c15cc23ecf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7e7b2b227303e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 13 15:32:11 2011 +0200 Improved .f12 compile helper, touch .py files --- web/.f12 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/.f12 b/web/.f12 index a1a000e..33fdab4 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,3 +1,3 @@ #!/bin/bash -C=$(sudo cp -prv * /omd/versions/default/share/check_mk/web/ | wc -l) +C=$(sudo cp -rv * /omd/versions/default/share/check_mk/web/ | wc -l) echo "$C files copied"

13 years, 1 month

← Newer
1
...
4
5
6
7
8
9
10
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2011