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
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
43037d54
Commit
43037d54
authored
Feb 05, 2020
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_corporate_identity: fix can't change language issue
parent
74a2069d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
10 deletions
+12
-10
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Base_viewAsReport.py
...portal_skins/erp5_corporate_identity/Base_viewAsReport.py
+12
-10
No files found.
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Base_viewAsReport.py
View file @
43037d54
...
@@ -96,18 +96,25 @@ doc_translated_title = translateText(doc_report_title) if doc_report_title else
...
@@ -96,18 +96,25 @@ doc_translated_title = translateText(doc_report_title) if doc_report_title else
if
doc_language
is
None
or
doc_language
==
""
:
if
doc_language
is
None
or
doc_language
==
""
:
doc_language
=
doc_localiser
.
get_selected_language
()
or
doc_localiser
.
get_default_language
()
or
"en"
doc_language
=
doc_localiser
.
get_selected_language
()
or
doc_localiser
.
get_default_language
()
or
"en"
doc_language
=
html_quote
(
override_document_language
)
if
override_document_language
else
doc_language
if
doc_language
is
not
None
:
doc
.
REQUEST
[
'AcceptLanguage'
].
set
(
doc_language
,
10
)
else
:
doc_language
=
blank
# custom header
# custom header
doc_header
=
None
doc_header
=
None
doc_report_header
=
kw
.
get
(
'report_header'
,
None
)
doc_report_header
=
kw
.
get
(
'report_header'
,
None
)
if
doc_report_header
:
if
doc_report_header
:
doc_report_header
=
getattr
(
doc
,
doc_report_header
)
doc_report_header
=
getattr
(
doc
,
doc_report_header
)
doc_header
=
doc_report_header
()
doc_header
=
doc_report_header
(
language
=
doc_language
)
doc_footer
=
None
doc_footer
=
None
doc_report_footer
=
kw
.
get
(
'report_footer'
,
None
)
doc_report_footer
=
kw
.
get
(
'report_footer'
,
None
)
if
doc_report_footer
:
if
doc_report_footer
:
doc_report_footer
=
getattr
(
doc
,
doc_report_footer
)
doc_report_footer
=
getattr
(
doc
,
doc_report_footer
)
doc_footer
=
doc_report_footer
()
doc_footer
=
doc_report_footer
(
language
=
doc_language
)
doc_content
,
report_override_doc_title
,
report_override_doc_subtitle
=
doc_report
(
doc_content
,
report_override_doc_title
,
report_override_doc_subtitle
=
doc_report
(
display_report
=
None
if
doc_embed
else
True
,
display_report
=
None
if
doc_embed
else
True
,
...
@@ -123,29 +130,25 @@ doc_content, report_override_doc_title, report_override_doc_subtitle = doc_repor
...
@@ -123,29 +130,25 @@ doc_content, report_override_doc_title, report_override_doc_subtitle = doc_repor
start_date
=
doc_report_start_date
,
start_date
=
doc_report_start_date
,
stop_date
=
doc_report_stop_date
,
stop_date
=
doc_report_stop_date
,
report_title
=
doc_translated_title
,
report_title
=
doc_translated_title
,
override_batch_mode
=
override_batch_mode
override_batch_mode
=
override_batch_mode
,
language
=
doc_language
)
)
if
doc
.
isModuleType
():
if
doc
.
isModuleType
():
doc_reference
=
html_quote
(
override_document_reference
)
if
override_document_reference
else
blank
doc_reference
=
html_quote
(
override_document_reference
)
if
override_document_reference
else
blank
doc_short_title
=
translateText
(
report_override_doc_subtitle
if
report_override_doc_subtitle
else
html_quote
(
doc_report_title
)
if
doc_report_title
else
blank
)
doc_short_title
=
translateText
(
report_override_doc_subtitle
if
report_override_doc_subtitle
else
html_quote
(
doc_report_title
)
if
doc_report_title
else
blank
)
doc_version
=
html_quote
(
override_document_version
)
if
override_document_version
else
getattr
(
doc
,
"version"
,
None
)
or
"001"
doc_version
=
html_quote
(
override_document_version
)
if
override_document_version
else
getattr
(
doc
,
"version"
,
None
)
or
"001"
doc_title
=
translateText
(
html_quote
(
override_document_title
)
if
override_document_title
else
report_override_doc_title
if
report_override_doc_title
else
blank
)
doc_title
=
translateText
(
html_quote
(
override_document_title
)
if
override_document_title
else
report_override_doc_title
if
report_override_doc_title
else
blank
)
doc_language
=
html_quote
(
override_document_language
)
if
override_document_language
else
doc_language
else
:
else
:
doc_reference
=
html_quote
(
override_document_reference
)
if
override_document_reference
else
doc
.
getReference
()
or
blank
doc_reference
=
html_quote
(
override_document_reference
)
if
override_document_reference
else
doc
.
getReference
()
or
blank
doc_short_title
=
translateText
(
report_override_doc_subtitle
if
report_override_doc_subtitle
else
html_quote
(
doc_report_title
)
if
doc_report_title
else
doc
.
getShortTitle
()
or
blank
)
doc_short_title
=
translateText
(
report_override_doc_subtitle
if
report_override_doc_subtitle
else
html_quote
(
doc_report_title
)
if
doc_report_title
else
doc
.
getShortTitle
()
or
blank
)
doc_version
=
html_quote
(
override_document_version
)
if
override_document_version
else
getattr
(
doc
,
"version"
,
None
)
or
"001"
doc_version
=
html_quote
(
override_document_version
)
if
override_document_version
else
getattr
(
doc
,
"version"
,
None
)
or
"001"
doc_title
=
translateText
(
html_quote
(
override_document_title
)
if
override_document_title
else
report_override_doc_title
if
report_override_doc_title
else
doc
.
getTitle
()
or
blank
)
doc_title
=
translateText
(
html_quote
(
override_document_title
)
if
override_document_title
else
report_override_doc_title
if
report_override_doc_title
else
doc
.
getTitle
()
or
blank
)
doc_language
=
html_quote
(
override_document_language
)
if
override_document_language
else
doc_language
# test overrides
# test overrides
if
override_batch_mode
:
if
override_batch_mode
:
doc_modification_date
=
DateTime
(
"1976-11-04"
)
doc_modification_date
=
DateTime
(
"1976-11-04"
)
doc_revision
=
"1"
doc_revision
=
"1"
if
doc_language
is
not
None
:
doc
.
REQUEST
[
'AcceptLanguage'
].
set
(
doc_language
,
10
)
if
doc_language
is
None
:
doc_language
=
blank
if
doc_reference
==
blank
:
if
doc_reference
==
blank
:
doc_reference
=
doc_prefix
+
doc_title
.
replace
(
" "
,
"."
)
doc_reference
=
doc_prefix
+
doc_title
.
replace
(
" "
,
"."
)
doc_full_reference
=
'-'
.
join
([
doc_reference
,
doc_version
,
doc_language
])
doc_full_reference
=
'-'
.
join
([
doc_reference
,
doc_version
,
doc_language
])
...
@@ -153,7 +156,6 @@ doc_short_date = doc_modification_date.strftime('%Y-%m-%d')
...
@@ -153,7 +156,6 @@ doc_short_date = doc_modification_date.strftime('%Y-%m-%d')
# ------------------------------- Theme ----------------------------------------
# ------------------------------- Theme ----------------------------------------
doc_theme
=
doc
.
Base_getThemeDict
(
doc_format
=
doc_format
,
css_path
=
"template_css/book"
,
skin
=
"Book"
)
doc_theme
=
doc
.
Base_getThemeDict
(
doc_format
=
doc_format
,
css_path
=
"template_css/book"
,
skin
=
"Book"
)
# --------------------------- Source/Destination -------------------------------
# --------------------------- Source/Destination -------------------------------
doc_source
=
doc
.
Base_getSourceDict
(
doc_source
=
doc
.
Base_getSourceDict
(
override_source_person_title
=
None
,
override_source_person_title
=
None
,
...
...
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