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
9e9e738d
Commit
9e9e738d
authored
Nov 21, 2016
by
Alexander Yuzhin
Committed by
Maxim Kadushkin
Nov 21, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE mobile] Localization EditText, ThemeColorPalette.
parent
932d5b3d
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
99 additions
and
45 deletions
+99
-45
apps/common/mobile/lib/component/ThemeColorPalette.js
apps/common/mobile/lib/component/ThemeColorPalette.js
+1
-1
apps/documenteditor/mobile/app/controller/edit/EditText.js
apps/documenteditor/mobile/app/controller/edit/EditText.js
+10
-6
apps/documenteditor/mobile/app/template/EditText.template
apps/documenteditor/mobile/app/template/EditText.template
+33
-33
apps/documenteditor/mobile/app/view/edit/EditText.js
apps/documenteditor/mobile/app/view/edit/EditText.js
+26
-4
apps/documenteditor/mobile/locale/en.json
apps/documenteditor/mobile/locale/en.json
+29
-1
No files found.
apps/common/mobile/lib/component/ThemeColorPalette.js
View file @
9e9e738d
...
...
@@ -204,6 +204,6 @@ define([
},
textThemeColors
:
'
Theme Colors
'
,
textStandartColors
:
'
Standar
t
Colors
'
textStandartColors
:
'
Standar
d
Colors
'
},
Common
.
UI
.
ThemeColorPalette
||
{}));
});
\ No newline at end of file
apps/documenteditor/mobile/app/controller/edit/EditText.js
View file @
9e9e738d
...
...
@@ -46,7 +46,7 @@ define([
],
function
(
core
)
{
'
use strict
'
;
DE
.
Controllers
.
EditText
=
Backbone
.
Controller
.
extend
((
function
()
{
DE
.
Controllers
.
EditText
=
Backbone
.
Controller
.
extend
(
_
.
extend
(
(
function
()
{
var
_fontsArray
=
[],
_stack
=
[],
_paragraphObject
=
undefined
,
...
...
@@ -491,7 +491,7 @@ define([
},
onApiChangeFont
:
function
(
font
)
{
var
name
=
(
_
.
isFunction
(
font
.
get_Name
)
?
font
.
get_Name
()
:
font
.
asc_getName
())
||
'
Fonts
'
;
var
name
=
(
_
.
isFunction
(
font
.
get_Name
)
?
font
.
get_Name
()
:
font
.
asc_getName
())
||
this
.
textFonts
;
_fontInfo
.
name
=
name
;
$
(
'
#font-fonts .item-title
'
).
html
(
name
);
...
...
@@ -501,7 +501,7 @@ define([
_fontInfo
.
size
=
size
;
var
displaySize
=
_fontInfo
.
size
;
_
.
isUndefined
(
displaySize
)
?
displaySize
=
'
Auto
'
:
displaySize
=
displaySize
+
'
'
+
'
pt
'
;
_
.
isUndefined
(
displaySize
)
?
displaySize
=
this
.
textAuto
:
displaySize
=
displaySize
+
'
'
+
this
.
textPt
;
$
(
'
#font-fonts .item-after span:first-child
'
).
html
(
displaySize
);
$
(
'
#font-size .item-after label
'
).
html
(
displaySize
);
...
...
@@ -592,7 +592,11 @@ define([
// Helpers
_toggleButton
:
function
(
e
)
{
return
$
(
e
.
currentTarget
).
toggleClass
(
'
active
'
).
hasClass
(
'
active
'
);
}
},
textFonts
:
'
Fonts
'
,
textAuto
:
'
Auto
'
,
textPt
:
'
pt
'
}
})()
);
});
})()
,
DE
.
Controllers
.
EditText
||
{}))
});
\ No newline at end of file
apps/documenteditor/mobile/app/template/EditText.template
View file @
9e9e738d
This diff is collapsed.
Click to expand it.
apps/documenteditor/mobile/app/view/edit/EditText.js
View file @
9e9e738d
...
...
@@ -49,7 +49,7 @@ define([
],
function
(
editTemplate
,
$
,
_
,
Backbone
)
{
'
use strict
'
;
DE
.
Views
.
EditText
=
Backbone
.
View
.
extend
((
function
()
{
DE
.
Views
.
EditText
=
Backbone
.
View
.
extend
(
_
.
extend
(
(
function
()
{
// private
var
_fontsList
,
_editTextController
;
...
...
@@ -116,6 +116,7 @@ define([
this
.
layout
=
$
(
'
<div/>
'
).
append
(
this
.
template
({
android
:
Common
.
SharedSettings
.
get
(
'
android
'
),
phone
:
Common
.
SharedSettings
.
get
(
'
phone
'
),
scope
:
this
,
bullets
:
_bullets
,
numbers
:
_numbers
}));
...
...
@@ -225,8 +226,29 @@ define([
showNumbers
:
function
()
{
this
.
showPage
(
'
#edit-text-numbers
'
);
}
}
,
textFonts
:
'
Fonts
'
,
textFontColor
:
'
Font Color
'
,
textHighlightColor
:
'
Highlight Color
'
,
textAdditionalFormat
:
'
Additional Formatting
'
,
textBack
:
'
Back
'
,
textSize
:
'
Size
'
,
textFontColors
:
'
Font Colors
'
,
textAutomatic
:
'
Automatic
'
,
textHighlightColors
:
'
Highlight Colors
'
,
textAdditional
:
'
Additional
'
,
textStrikethrough
:
'
Strikethrough
'
,
textDblStrikethrough
:
'
Double Strikethrough
'
,
textDblSuperscript
:
'
Superscript
'
,
textSubscript
:
'
Subscript
'
,
textSmallCaps
:
'
Small Caps
'
,
textAllCaps
:
'
All Caps
'
,
textLetterSpacing
:
'
Letter Spacing
'
,
textLineSpacing
:
'
Line Spacing
'
,
textBullets
:
'
Bullets
'
,
textNone
:
'
None
'
,
textNumbers
:
'
Numbers
'
}
})()
);
});
})()
,
DE
.
Views
.
EditText
||
{}))
});
\ No newline at end of file
apps/documenteditor/mobile/locale/en.json
View file @
9e9e738d
{
"Common.UI.ThemeColorPalette.textThemeColors"
:
"Theme Colors"
,
"Common.UI.ThemeColorPalette.textStandartColors"
:
"Standard Colors"
,
"DE.Controllers.Main.leavePageText"
:
"You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes."
,
"DE.Controllers.Main.defaultTitleText"
:
"ONLYOFFICE Document Editor"
,
"DE.Controllers.Main.criticalErrorTitle"
:
"Error"
,
...
...
@@ -319,5 +322,30 @@
"DE.Views.EditTabletextBandedRow"
:
"Banded Row"
,
"DE.Views.EditTabletextFirstColumn"
:
"First Column"
,
"DE.Views.EditTabletextLastColumn"
:
"Last Column"
,
"DE.Views.EditTabletextBandedColumn"
:
"Banded Column"
"DE.Views.EditTabletextBandedColumn"
:
"Banded Column"
,
"DE.Controllers.EditText.textFonts"
:
"Fonts"
,
"DE.Controllers.EditText.textAuto"
:
"Auto"
,
"DE.Controllers.EditText.textPt"
:
"pt"
,
"DE.Views.EditText.textFonts"
:
"Fonts"
,
"DE.Views.EditText.textFontColor"
:
"Font Color"
,
"DE.Views.EditText.textHighlightColor"
:
"Highlight Color"
,
"DE.Views.EditText.textAdditionalFormat"
:
"Additional Formatting"
,
"DE.Views.EditText.textBack"
:
"Back"
,
"DE.Views.EditText.textSize"
:
"Size"
,
"DE.Views.EditText.textFontColors"
:
"Font Colors"
,
"DE.Views.EditText.textAutomatic"
:
"Automatic"
,
"DE.Views.EditText.textHighlightColors"
:
"Highlight Colors"
,
"DE.Views.EditText.textAdditional"
:
"Additional"
,
"DE.Views.EditText.textStrikethrough"
:
"Strikethrough"
,
"DE.Views.EditText.textDblStrikethrough"
:
"Double Strikethrough"
,
"DE.Views.EditText.textDblSuperscript"
:
"Superscript"
,
"DE.Views.EditText.textSubscript"
:
"Subscript"
,
"DE.Views.EditText.textSmallCaps"
:
"Small Caps"
,
"DE.Views.EditText.textAllCaps"
:
"All Caps"
,
"DE.Views.EditText.textLetterSpacing"
:
"Letter Spacing"
,
"DE.Views.EditText.textLineSpacing"
:
"Line Spacing"
,
"DE.Views.EditText.textBullets"
:
"Bullets"
,
"DE.Views.EditText.textNone"
:
"None"
,
"DE.Views.EditText.textNumbers"
:
"Numbers"
}
\ No newline at end of file
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