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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
erp5
Commits
5f02a4a0
Commit
5f02a4a0
authored
Mar 19, 2018
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_hal_json_style] Translate domain title
parent
2bfe9dab
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
4 deletions
+12
-4
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
...rtal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
+1
-1
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testFilterEditor.zpt
...al_tests/renderjs_ui_translate_zuite/testFilterEditor.zpt
+9
-3
bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Base_createBaseLanguage.py
...kins/erp5_web_renderjs_ui_test/Base_createBaseLanguage.py
+2
-0
No files found.
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
View file @
5f02a4a0
...
...
@@ -852,7 +852,7 @@ def renderField(traversed_document, field, form, value=None, meta_type=None, key
"query"
:
sql_catalog
.
buildQuery
(
list_method_query_dict
,
ignore_unknown_columns
=
True
).
asSearchTextExpression
(
sql_catalog
)})},
"domain_root_list"
:
field
.
get_value
(
"domain_root_list"
)
"domain_root_list"
:
[(
x
,
Base_translateString
(
y
))
for
x
,
y
in
field
.
get_value
(
"domain_root_list"
)]
})
result
[
"domain_dict"
]
=
getDomainSelection
([
x
[
0
]
for
x
in
result
[
"domain_root_list"
]])
...
...
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testFilterEditor.zpt
View file @
5f02a4a0
...
...
@@ -11,11 +11,17 @@
</thead><tbody>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplate/macros/init"
/>
<!-- Let's set up domain property on listbox -->
<tr><td>
open
</td>
<td>
${base_url}/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_all_columns=creation_date+%7C+Creation Date+%0A+modification_date+%7C+Modification Date+%0A+owner_title+%7C+Owner
&
field_domain_root_list=foo_category+%7C+Foo%20Category+%0A+foo_domain+%7C+Foo%20Domain
</td><td></td></tr>
<tr><td>
assertTextPresent
</td>
<td>
Set Successfully.
</td><td></td></tr>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/create_translation_data"
/>
<tr>
<td>
open
</td>
<td>
${base_url}/web_site_module/renderjs_runner/wo/#/foo_
bar_
module
</td>
<td>
${base_url}/web_site_module/renderjs_runner/wo/#/foo_module
</td>
<td></td>
</tr>
...
...
@@ -54,7 +60,7 @@
<tr>
<td>
verifySelectOptions
</td>
<td>
//div[@class="filter_item_container"]/div[1]//select[1]
</td>
<td>
ID,biaoti,chuangjianshijian,xiugaishijian,shuoyouzhe,soushuowenben,soushuo
</td>
<td>
ID,biaoti,chuangjianshijian,xiugaishijian,shuoyouzhe,
Foo leibie,Foo quyu,
soushuowenben,soushuo
</td>
</tr>
<tr>
...
...
@@ -68,7 +74,7 @@
<tr>
<td>
select
</td>
<td>
//div[@class="filter_item_container"]/div[1]//select[1]
</td>
<td>
index=
5
</td>
<td>
index=
7
</td>
</tr>
...
...
bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Base_createBaseLanguage.py
View file @
5f02a4a0
...
...
@@ -70,6 +70,8 @@ param_dict = [
{
'message'
:
'Creation Date'
,
'translation'
:
'chuangjianshijian'
,
'language'
:
'wo'
},
{
'message'
:
'Modification Date'
,
'translation'
:
'xiugaishijian'
,
'language'
:
'wo'
},
{
'message'
:
'Owner'
,
'translation'
:
'shuoyouzhe'
,
'language'
:
'wo'
},
{
'message'
:
'Foo Domain'
,
'translation'
:
'Foo quyu'
,
'language'
:
'wo'
},
{
'message'
:
'Foo Category'
,
'translation'
:
'Foo leibie'
,
'language'
:
'wo'
},
{
'message'
:
'Configure'
,
'translation'
:
'peizhi'
,
'language'
:
'wo'
},
{
'message'
:
'Configure Editor'
,
'translation'
:
'peizhibianjiqi'
,
'language'
:
'wo'
},
{
'message'
:
'This page contains unsaved changes, do you really want to leave the page ?'
,
'translation'
:
'querenlikai?'
,
'language'
:
'wo'
}
...
...
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