On 06/11/2014 03:02 PM, Zhou Zheng Sheng wrote:
Reviewed-by: Zhou Zheng Sheng <zhshzhou(a)linux.ibm.com>
Reviewed all the patches, look good, only some trivial problems found
but they don't affect the correctness.
improve them.
thanks.
on 2014/06/10 18:15, shaohef(a)linux.vnet.ibm.com wrote:
> From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
>
> 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 (7):
> 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 optional to toggle the sample plugin
> generate the translation files for plugins/sample
> skip plugins test, when sample plugin is not enabled
>
> Zhou Zheng Sheng (1):
> Add Minimal UI Page for the Sample Plugin
>
> configure.ac | 17 ++++
> 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 | 1 +
> plugins/sample/po/POTFILES.in | 2 +
> plugins/sample/po/en_US.po | 21 ++++
> plugins/sample/po/gen-pot | 1 +
> plugins/sample/po/pt_BR.po | 24 +++++
> plugins/sample/po/zh_CN.po | 24 +++++
> plugins/sample/sample.conf | 7 --
> plugins/sample/sample.conf.in | 12 +++
> plugins/sample/ui/config/tab-ext.xml | 8 +-
> plugins/sample/ui/pages/i18n.json.tmpl | 9 ++
> plugins/sample/ui/pages/tab.html.tmpl | 6 ++
> src/kimchi/root.py | 5 +
> src/kimchi/template.py | 34 ++++---
> tests/test_plugin.py | 5 +-
> ui/js/src/kimchi.api.js | 18 +++-
> ui/js/src/kimchi.main.js | 24 ++++-
> ui/pages/i18n.html.tmpl | 178 ---------------------------------
> ui/pages/i18n.json.tmpl | 165 ++++++++++++++++++++++++++++++
> 24 files changed, 364 insertions(+), 214 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 120000 plugins/sample/po/Makevars
> create mode 100644 plugins/sample/po/POTFILES.in
> create mode 100644 plugins/sample/po/en_US.po
> create mode 120000 plugins/sample/po/gen-pot
> create mode 100644 plugins/sample/po/pt_BR.po
> 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/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(a)linux.vnet.ibm.com>
IBM Linux Technology Center