Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
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
Eric Zheng
slapos.core
Commits
98f7de66
Commit
98f7de66
authored
Jul 23, 2020
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Plain Diff
Fix small bugs in translation
See merge request
nexedi/slapos.core!243
parents
b83ce7f7
73e48137
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
673 additions
and
682 deletions
+673
-682
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_translation_data_js.js
.../web_page_module/rjs_gadget_slapos_translation_data_js.js
+667
-677
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_translation_data_js.xml
...web_page_module/rjs_gadget_slapos_translation_data_js.xml
+2
-2
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/WebSection_newCredentialRequest.py
.../slapos_hal_json_style/WebSection_newCredentialRequest.py
+4
-3
No files found.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_translation_data_js.js
View file @
98f7de66
This diff is collapsed.
Click to expand it.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_translation_data_js.xml
View file @
98f7de66
...
@@ -238,7 +238,7 @@
...
@@ -238,7 +238,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
985.
18996.46043.1041
</string>
</value>
<value>
<string>
985.
20334.53486.8772
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -256,7 +256,7 @@
...
@@ -256,7 +256,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
159
4917325.33
</float>
<float>
159
5425713.87
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/WebSection_newCredentialRequest.py
View file @
98f7de66
...
@@ -42,8 +42,9 @@ credential_request.setCategoryList(category_list)
...
@@ -42,8 +42,9 @@ credential_request.setCategoryList(category_list)
credential_request
.
reindexObject
(
activate_kw
=
dict
(
tag
=
'set_login_%s'
%
reference
.
encode
(
'hex'
)))
credential_request
.
reindexObject
(
activate_kw
=
dict
(
tag
=
'set_login_%s'
%
reference
.
encode
(
'hex'
)))
if
portal_preferences
.
getPreferredCredentialAlarmAutomaticCall
():
if
portal_preferences
.
getPreferredCredentialAlarmAutomaticCall
():
portal_type
=
context
.
Base_translateString
(
"Credential Request"
)
credential_request
.
submit
(
"Automatic submit"
)
credential_request
.
submit
(
"Automatic submit"
)
message_str
=
"Credential Request Created."
message_str
=
context
.
Base_translateString
(
"${portal_type} Created."
,
mapping
=
({
'portal_type'
:
portal_type
}))
else
:
else
:
if
portal_preferences
.
isPreferredEmailVerificationCheck
():
if
portal_preferences
.
isPreferredEmailVerificationCheck
():
# after_path_and_method_id argument is used below to not activate when
# after_path_and_method_id argument is used below to not activate when
...
@@ -61,8 +62,8 @@ else:
...
@@ -61,8 +62,8 @@ else:
else
:
else
:
# no email verification is needed
# no email verification is needed
credential_request
.
submit
(
"Automatic submit"
)
credential_request
.
submit
(
"Automatic submit"
)
message_str
=
"Credential Request Created."
message_str
=
context
.
Base_translateString
(
"${portal_type} Created."
,
mapping
=
({
'portal_type'
:
portal_type
}))
if
batch_mode
:
if
batch_mode
:
return
credential_request
return
credential_request
...
...
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