V8 -> V9 rebase. fix some commit message. On 06/13/2014 06:28 PM, shaohef@linux.vnet.ibm.com wrote:
From: ShaoHe Feng <shaohef@linux.vnet.ibm.com>
V7 -> V8: improve the commit message. improve the test case skip conditional expression, remove parenthesis
V5 -> V6: skip test, when disable plugin.
V4 -> V5: let autoconf generate sample.conf
V3 -> V4: rebase
V2 -> V3: change "enable-plugins" to "enable-sample" remove nls improve the Portuguese translation.
V1 -> V2: The improvement concept here is to directly generate JSON on the server and assign it to the i18n variable, rather than inserting nodes into the DOM. Plugins would use a plugin1.i18n= structure to keep plugin strings from colliding with each other, or with the kimchi variables.
ShaoHe Feng (8): Update root.py to make Cheetah render the JSON template. Update the i18n tmpl to produce JSON Add JS API for fetching i18n JSON Issue #342: load i18n.html of the plugin add an option to toggle the sample plugin generate the translation files for plugins/sample skip plugins test, when sample plugin is not enabled add some sample plugin generated files to .gitignore
Zhou Zheng Sheng (1): Add Minimal UI Page for the Sample Plugin
.gitignore | 2 + configure.ac | 19 ++++ plugins/sample/Makefile.am | 11 +- plugins/sample/__init__.py | 3 +- plugins/sample/config.status | 1 + plugins/sample/po/LINGUAS | 1 + plugins/sample/po/Makefile.in.in | 1 + plugins/sample/po/Makevars | 41 ++++++++ plugins/sample/po/POTFILES.in | 2 + plugins/sample/po/en_US.po | 21 ++++ plugins/sample/po/gen-pot | 9 ++ plugins/sample/po/pt_BR.po | 24 +++++ plugins/sample/po/sample.pot | 21 ++++ plugins/sample/po/zh_CN.po | 24 +++++ plugins/sample/sample.conf | 7 -- plugins/sample/sample.conf.in | 24 +++++ plugins/sample/ui/Makefile.am | 2 +- plugins/sample/ui/config/tab-ext.xml | 8 +- plugins/sample/ui/js/Makefile.am | 21 ++++ plugins/sample/ui/js/util.js | 33 ++++++ plugins/sample/ui/pages/Makefile.am | 21 ++++ plugins/sample/ui/pages/i18n.json.tmpl | 9 ++ plugins/sample/ui/pages/tab.html.tmpl | 30 ++++++ src/kimchi/root.py | 5 + src/kimchi/template.py | 34 ++++--- tests/test_plugin.py | 4 + ui/js/src/kimchi.api.js | 18 +++- ui/js/src/kimchi.main.js | 24 ++++- ui/pages/i18n.html.tmpl | 179 --------------------------------- ui/pages/i18n.json.tmpl | 166 ++++++++++++++++++++++++++++++ 30 files changed, 550 insertions(+), 215 deletions(-) create mode 120000 plugins/sample/config.status create mode 120000 plugins/sample/po/LINGUAS create mode 120000 plugins/sample/po/Makefile.in.in create mode 100644 plugins/sample/po/Makevars create mode 100644 plugins/sample/po/POTFILES.in create mode 100644 plugins/sample/po/en_US.po create mode 100755 plugins/sample/po/gen-pot create mode 100644 plugins/sample/po/pt_BR.po create mode 100644 plugins/sample/po/sample.pot create mode 100644 plugins/sample/po/zh_CN.po delete mode 100644 plugins/sample/sample.conf create mode 100644 plugins/sample/sample.conf.in create mode 100644 plugins/sample/ui/js/Makefile.am create mode 100644 plugins/sample/ui/js/util.js create mode 100644 plugins/sample/ui/pages/Makefile.am create mode 100644 plugins/sample/ui/pages/i18n.json.tmpl create mode 100644 plugins/sample/ui/pages/tab.html.tmpl delete mode 100644 ui/pages/i18n.html.tmpl create mode 100644 ui/pages/i18n.json.tmpl
-- Thanks and best regards! Sheldon Feng(冯少合)<shaohef@linux.vnet.ibm.com> IBM Linux Technology Center