Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
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
Boris Kocherov
web-apps
Commits
d0491142
Commit
d0491142
authored
Jun 01, 2017
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE] For Bug 35040. Show current document locale in the settings in left panel.
parent
beb3aa20
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
27 deletions
+10
-27
apps/spreadsheeteditor/main/app/controller/Toolbar.js
apps/spreadsheeteditor/main/app/controller/Toolbar.js
+5
-6
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
+5
-21
No files found.
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file @
d0491142
...
...
@@ -951,8 +951,8 @@ define([
onCustomNumberFormat
:
function
()
{
var
me
=
this
,
value
=
Common
.
localStorage
.
getItem
(
"
sse-settings-reg-settings
"
);
value
=
(
value
!==
null
)
?
parseInt
(
value
)
:
((
me
.
toolbar
.
mode
.
lang
)
?
parseInt
(
Common
.
util
.
LanguageInfo
.
getLocalLanguageCode
(
me
.
toolbar
.
mode
.
lang
))
:
0x0409
);
value
=
me
.
api
.
asc_getLocale
(
);
(
!
value
)
&&
(
value
=
((
me
.
toolbar
.
mode
.
lang
)
?
parseInt
(
Common
.
util
.
LanguageInfo
.
getLocalLanguageCode
(
me
.
toolbar
.
mode
.
lang
))
:
0x0409
)
);
(
new
SSE
.
Views
.
FormatSettingsDialog
({
api
:
me
.
api
,
...
...
@@ -970,10 +970,9 @@ define([
onNumberFormatOpenBefore
:
function
(
combo
)
{
if
(
this
.
api
)
{
var
me
=
this
;
var
value
=
Common
.
localStorage
.
getItem
(
"
sse-settings-reg-settings
"
);
value
=
(
value
!==
null
)
?
parseInt
(
value
)
:
((
this
.
toolbar
.
mode
.
lang
)
?
parseInt
(
Common
.
util
.
LanguageInfo
.
getLocalLanguageCode
(
this
.
toolbar
.
mode
.
lang
))
:
0x0409
);
var
me
=
this
,
value
=
me
.
api
.
asc_getLocale
();
(
!
value
)
&&
(
value
=
((
me
.
toolbar
.
mode
.
lang
)
?
parseInt
(
Common
.
util
.
LanguageInfo
.
getLocalLanguageCode
(
me
.
toolbar
.
mode
.
lang
))
:
0x0409
));
if
(
this
.
_state
.
langId
!==
value
)
{
this
.
_state
.
langId
=
value
;
...
...
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file @
d0491142
...
...
@@ -721,28 +721,12 @@ define([
this
.
cmbFuncLocale
.
setValue
(
item
?
item
.
get
(
'
value
'
)
:
'
en
'
);
this
.
updateFuncExample
(
item
?
item
.
get
(
'
exampleValue
'
)
:
this
.
txtExampleEn
);
value
=
Common
.
localStorage
.
getItem
(
"
sse-settings-reg-settings
"
);
if
(
value
!==
null
)
{
item
=
this
.
cmbRegSettings
.
store
.
findWhere
({
value
:
parseInt
(
value
)
});
this
.
cmbRegSettings
.
setValue
(
item
?
item
.
get
(
'
value
'
)
:
0x0409
);
value
=
this
.
api
.
asc_getLocale
(
);
if
(
value
)
{
item
=
this
.
cmbRegSettings
.
store
.
findWhere
({
value
:
value
});
this
.
cmbRegSettings
.
setValue
(
item
?
item
.
get
(
'
value
'
)
:
Common
.
util
.
LanguageInfo
.
getLocalLanguageName
(
value
)[
1
]
);
}
else
{
if
(
this
.
mode
.
lang
)
{
var
lang
=
this
.
mode
.
lang
.
toLowerCase
(),
langshort
=
lang
.
split
(
"
-
"
)[
0
].
toLowerCase
(),
code
=
Common
.
util
.
LanguageInfo
.
getLocalLanguageCode
(
lang
),
codefull
,
codeshort
;
this
.
cmbRegSettings
.
store
.
each
(
function
(
model
){
var
val
=
model
.
get
(
'
value
'
),
langname
=
Common
.
util
.
LanguageInfo
.
getLocalLanguageName
(
val
)[
0
].
toLowerCase
();
if
(
langname
==
lang
)
codefull
=
val
;
if
(
langname
.
indexOf
(
langshort
)
==
0
)
codeshort
=
val
;
});
code
=
(
codefull
)
?
codefull
:
((
codeshort
)
?
codeshort
:
((
code
)
?
Common
.
util
.
LanguageInfo
.
getLocalLanguageName
(
code
)[
1
]
:
0x0409
));
this
.
cmbRegSettings
.
setValue
(
code
);
}
else
this
.
cmbRegSettings
.
setValue
(
0x0409
);
this
.
cmbRegSettings
.
setValue
((
this
.
mode
.
lang
)
?
Common
.
util
.
LanguageInfo
.
getLocalLanguageName
(
parseInt
(
Common
.
util
.
LanguageInfo
.
getLocalLanguageCode
(
this
.
mode
.
lang
)))[
1
]
:
0x0409
);
}
this
.
updateRegionalExample
(
this
.
cmbRegSettings
.
getValue
());
},
...
...
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