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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
erp5
Commits
2accbe65
Commit
2accbe65
authored
Jan 02, 2015
by
Sven Franck
Committed by
Xiaowu Zhang
Jan 12, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_renderjs_ui: skip translating panel contents if no translations or not loaded in time
parent
f9954f7f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
14 deletions
+17
-14
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml
...TemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml
+17
-14
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml
View file @
2accbe65
...
@@ -170,16 +170,17 @@
...
@@ -170,16 +170,17 @@
})\n
})\n
.push(function (all_result) {\n
.push(function (all_result) {\n
var i,\n
var i,\n
i_len,\n
tmp,\n
tmp,\n
document_list = [],\n
document_list = [],\n
language_list = JSON.parse(all_result[2]),\n
language_list = all_result[2];\n
i_len = language_list.length;\n
\n
\n
// XXX: Customize panel header!\n
// XXX: Customize panel header!\n
tmp = panel_template();\n
tmp = panel_template();\n
\n
\n
// XXX: will there be websites without translations/multiple lang?\n
// translation list available\n
if (i_len >
1) {\n
if (language_list) {\n
i_len = language_list.length;\n
for (i = 0; i < i_len; i += 1) {\n
for (i = 0; i < i_len; i += 1) {\n
document_list.push({"count": i, "lang": language_list[i]});\n
document_list.push({"count": i, "lang": language_list[i]});\n
}\n
}\n
...
@@ -188,16 +189,18 @@
...
@@ -188,16 +189,18 @@
history_href: all_result[1],\n
history_href: all_result[1],\n
document_list: document_list\n
document_list: document_list\n
});\n
});\n
}
else
{\n
return g.translateHtml(tmp);\n
tmp
+=
panel_template_nolang({\n
module_href:
all_result[0],\n
history_href:
all_result[1]\n
});\n
}\n
}\n
return
g.translateHtml(tmp);\n
\n
// no translations available or not loaded when reaching this point\n
tmp += panel_template_nolang({\n
module_href: all_result[0],\n
history_href: all_result[1]\n
});\n
return tmp;\n
})\n
})\n
.push(function
(my_translated_html)
{\n
.push(function (my_translated_
or_plain_
html) {\n
g.props.jelement.html(my_translated_html);\n
g.props.jelement.html(my_translated_
or_plain_
html);\n
g.props.jelement.trigger("create");\n
g.props.jelement.trigger("create");\n
});\n
});\n
})\n
})\n
...
@@ -416,7 +419,7 @@
...
@@ -416,7 +419,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
39.64379.20572.33536
</string>
</value>
<value>
<string>
9
40.1578.52538.48913
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -434,7 +437,7 @@
...
@@ -434,7 +437,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1420
039467.89
</float>
<float>
1420
204041.51
</float>
<string>
GMT
</string>
<string>
GMT
</string>
</tuple>
</tuple>
</state>
</state>
...
...
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