Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
950a8237
Commit
950a8237
authored
Jan 09, 2015
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix translation bug in dialog gadget
parent
729cb937
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
28 deletions
+28
-28
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_js.xml
...tem/web_page_module/rjs_gadget_erp5_pt_form_dialog_js.xml
+28
-28
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_js.xml
View file @
950a8237
...
@@ -102,7 +102,7 @@
...
@@ -102,7 +102,7 @@
<value>
<string
encoding=
"cdata"
>
<![CDATA[
<value>
<string
encoding=
"cdata"
>
<![CDATA[
/*jslint nomen: true, indent: 2, maxerr: 3 */\n
/*jslint nomen: true, indent: 2, maxerr: 3 */\n
/*global window, rJS, RSVP, FormData, jIO, URI, loopEventListener */\n
/*global window, rJS, RSVP, FormData, jIO, URI, loopEventListener
, document
*/\n
(function (window, rJS, RSVP, FormData, jIO, URI, loopEventListener) {\n
(function (window, rJS, RSVP, FormData, jIO, URI, loopEventListener) {\n
"use strict";\n
"use strict";\n
\n
\n
...
@@ -136,10 +136,10 @@
...
@@ -136,10 +136,10 @@
.declareAcquiredMethod("pleaseRedirectMyHash", "pleaseRedirectMyHash")\n
.declareAcquiredMethod("pleaseRedirectMyHash", "pleaseRedirectMyHash")\n
.declareAcquiredMethod("whoWantToDisplayThisPage", "whoWantToDisplayThisPage")\n
.declareAcquiredMethod("whoWantToDisplayThisPage", "whoWantToDisplayThisPage")\n
.declareAcquiredMethod("whoWantToDisplayThis", "whoWantToDisplayThis")\n
.declareAcquiredMethod("whoWantToDisplayThis", "whoWantToDisplayThis")\n
.declareAcquiredMethod("translateHtml", "translateHtmlt")\n
.declareAcquiredMethod("renderPageHeader", "renderPageHeader")\n
.declareAcquiredMethod("renderPageHeader", "renderPageHeader")\n
.declareAcquiredMethod("notifySubmitting", "notifySubmitting")\n
.declareAcquiredMethod("notifySubmitting", "notifySubmitting")\n
.declareAcquiredMethod("notifySubmitted", "notifySubmitted")\n
.declareAcquiredMethod("notifySubmitted", "notifySubmitted")\n
.declareAcquiredMethod("translateHtml", "translateHtml")\n
\n
\n
\n
\n
/////////////////////////////////////////////////////////////////\n
/////////////////////////////////////////////////////////////////\n
...
@@ -167,6 +167,7 @@
...
@@ -167,6 +167,7 @@
i,\n
i,\n
icon,\n
icon,\n
span = document.createElement("span"),\n
span = document.createElement("span"),\n
section = form_gadget.__element.querySelector("section"),\n
selector = form_gadget.__element.querySelector("h3"),\n
selector = form_gadget.__element.querySelector("h3"),\n
view_list = erp5_document._links.action_workflow || [];\n
view_list = erp5_document._links.action_workflow || [];\n
\n
\n
...
@@ -175,7 +176,7 @@
...
@@ -175,7 +176,7 @@
title = view_list[i].title;\n
title = view_list[i].title;\n
}\n
}\n
}\n
}\n
\n
\n
// XXX hardcoded...\n
// XXX hardcoded...\n
switch (title) {\n
switch (title) {\n
case "Create User": icon = " ui-icon-user"; break;\n
case "Create User": icon = " ui-icon-user"; break;\n
...
@@ -195,6 +196,12 @@
...
@@ -195,6 +196,12 @@
form_options.form_definition = options.form_definition;\n
form_options.form_definition = options.form_definition;\n
form_options.view = options.view;\n
form_options.view = options.view;\n
\n
\n
return new RSVP.Queue()\n
.push(function () {\n
return form_gadget.translateHtml(section.innerHTML);\n
})\n
.push(function (my_translation_html) {\n
section.innerHTML = my_translation_html;\n
return RSVP.all([\n
return RSVP.all([\n
erp5_form.render(form_options),\n
erp5_form.render(form_options),\n
form_gadget.whoWantToDisplayThis(options.jio_key),\n
form_gadget.whoWantToDisplayThis(options.jio_key),\n
...
@@ -208,15 +215,8 @@
...
@@ -208,15 +215,8 @@
breadcrumb_url: all_result[2],\n
breadcrumb_url: all_result[2],\n
submit_action: true\n
submit_action: true\n
});\n
});\n
})\n
// XXX: DOM touches\n
.push(function () {\n
return form_gadget.translateHtml(form_gadget.props.element.innerHTML);\n
})\n
.push(function (my_translated_html) {\n
form_gadget.props.element.innerHTML = my_translated_html;\n
});\n
});\n
\n
});
\n
})\n
})\n
\n
\n
\n
\n
...
@@ -403,7 +403,7 @@
...
@@ -403,7 +403,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
actor
</string>
</key>
<key>
<string>
actor
</string>
</key>
<value>
<string>
super_sven
</string>
</value>
<value>
<string>
zope
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
comment
</string>
</key>
<key>
<string>
comment
</string>
</key>
...
@@ -417,7 +417,7 @@
...
@@ -417,7 +417,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
39.52858.22584.10
2
</string>
</value>
<value>
<string>
9
40.11718.18032.5898
2
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -435,8 +435,8 @@
...
@@ -435,8 +435,8 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14
19417804.8
4
</float>
<float>
14
20812706.2
4
</float>
<string>
GMT
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
</object>
</object>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment