Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
9d44ccec
Commit
9d44ccec
authored
Nov 29, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ui/scripts/Utils/utils): escape properly quotes in `openConfirmDialog`
parent
21120bd1
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
27 deletions
+22
-27
fr.ts
tests/assets/languages/fr.ts
+11
-23
MenuStyle.qml
tests/ui/modules/Common/Styles/Menu/MenuStyle.qml
+1
-1
utils.js
tests/ui/scripts/Utils/utils.js
+10
-3
No files found.
tests/assets/languages/fr.ts
View file @
9d44ccec
...
@@ -135,11 +135,11 @@
...
@@ -135,11 +135,11 @@
<
/message
>
<
/message
>
<
message
>
<
message
>
<
source
>
removeAllEntriesDescription
<
/source
>
<
source
>
removeAllEntriesDescription
<
/source
>
<
translation
type
=
"
unfinished
"
>
<
/translation
>
<
translation
>
Ê
tes
-
vous
s
û
r
de
vouloir
supprimer
cet
historique
?
<
/translation
>
<
/message
>
<
/message
>
<
message
>
<
message
>
<
source
>
removeAllEntriesTitle
<
/source
>
<
source
>
removeAllEntriesTitle
<
/source
>
<
translation
type
=
"
unfinished
"
>
<
/translation
>
<
translation
>
Suppression
de
l
'
historique
</translation>
</message>
</message>
</context>
</context>
<context>
<context>
...
@@ -161,7 +161,7 @@
...
@@ -161,7 +161,7 @@
</message>
</message>
<message>
<message>
<source>attachmentTooltip</source>
<source>attachmentTooltip</source>
<
translation
type
=
"
unfinished
"
>
<
/translation
>
<translation
>Envoyer un fichier
</translation>
</message>
</message>
</context>
</context>
<context>
<context>
...
@@ -170,41 +170,29 @@
...
@@ -170,41 +170,29 @@
<source>incomingCall</source>
<source>incomingCall</source>
<translation>Appel entrant</translation>
<translation>Appel entrant</translation>
</message>
</message>
<
message
>
<
source
>
hangup
<
/source
>
<
translation
type
=
"
vanished
"
>
Fin
d
&
apos
;
appel
<
/translation
>
<
/message
>
<
message
>
<
source
>
lostIncomingCall
<
/source
>
<
translation
type
=
"
vanished
"
>
Appel
entrant
manqu
é
<
/translation
>
<
/message
>
<
message
>
<
source
>
lostOutgoingCall
<
/source
>
<
translation
type
=
"
vanished
"
>
Appel
sortant
manqu
é
<
/translation
>
<
/message
>
<message>
<message>
<source>outgoingCall</source>
<source>outgoingCall</source>
<
translation
type
=
"
unfinished
"
>
<
/translation
>
<translation
>Appel sortant
</translation>
</message>
</message>
<message>
<message>
<source>declinedIncomingCall</source>
<source>declinedIncomingCall</source>
<
translation
type
=
"
unfinished
"
>
<
/translation
>
<translation
>Appel entrant refusé
</translation>
</message>
</message>
<message>
<message>
<source>declinedOutgoingCall</source>
<source>declinedOutgoingCall</source>
<
translation
type
=
"
unfinished
"
>
<
/translation
>
<translation
>Appel sortant refusé
</translation>
</message>
</message>
<message>
<message>
<source>endedCall</source>
<source>endedCall</source>
<
translation
type
=
"
unfinished
"
>
<
/translation
>
<translation
>Fin d
'
appel
<
/translation
>
<
/message
>
<
/message
>
<
message
>
<
message
>
<
source
>
missedIncomingCall
<
/source
>
<
source
>
missedIncomingCall
<
/source
>
<
translation
type
=
"
unfinished
"
>
<
/translation
>
<
translation
>
Appel
entrant
manqu
é
<
/translation
>
<
/message
>
<
/message
>
<
message
>
<
message
>
<
source
>
missedOutgoingCall
<
/source
>
<
source
>
missedOutgoingCall
<
/source
>
<
translation
type
=
"
unfinished
"
>
<
/translation
>
<
translation
>
Appel
sortant
sans
r
é
ponse
<
/translation
>
<
/message
>
<
/message
>
<
/context
>
<
/context
>
<
context
>
<
context
>
...
@@ -319,7 +307,7 @@
...
@@ -319,7 +307,7 @@
<
name
>
PresenceString
<
/name
>
<
name
>
PresenceString
<
/name
>
<
message
>
<
message
>
<
source
>
presenceOnline
<
/source
>
<
source
>
presenceOnline
<
/source
>
<
translation
type
=
"
unfinished
"
>
<
/translation
>
<
translation
>
En
ligne
<
/translation
>
<
/message
>
<
/message
>
<
message
>
<
message
>
<
source
>
presenceOutToLunch
<
/source
>
<
source
>
presenceOutToLunch
<
/source
>
...
@@ -339,7 +327,7 @@
...
@@ -339,7 +327,7 @@
<
/message
>
<
/message
>
<
message
>
<
message
>
<
source
>
presenceOffline
<
/source
>
<
source
>
presenceOffline
<
/source
>
<
translation
type
=
"
unfinished
"
>
<
/translation
>
<
translation
>
Hors
-
ligne
<
/translation
>
<
/message
>
<
/message
>
<
message
>
<
message
>
<
source
>
presenceUnknown
<
/source
>
<
source
>
presenceUnknown
<
/source
>
...
...
tests/ui/modules/Common/Styles/Menu/MenuStyle.qml
View file @
9d44ccec
...
@@ -28,7 +28,7 @@ QtObject {
...
@@ -28,7 +28,7 @@ QtObject {
}
}
property
QtObject
text
:
QtObject
{
property
QtObject
text
:
QtObject
{
property
int
fontSize
:
1
3
property
int
fontSize
:
1
1
property
QtObject
color
:
QtObject
{
property
QtObject
color
:
QtObject
{
property
color
normal
:
Colors
.
k50
property
color
normal
:
Colors
.
k50
...
...
tests/ui/scripts/Utils/utils.js
View file @
9d44ccec
...
@@ -80,7 +80,6 @@ function getTopParent (object, useFakeParent) {
...
@@ -80,7 +80,6 @@ function getTopParent (object, useFakeParent) {
var
parent
=
_getTopParent
(
object
,
useFakeParent
)
var
parent
=
_getTopParent
(
object
,
useFakeParent
)
var
p
var
p
while
((
p
=
_getTopParent
(
parent
,
useFakeParent
))
!=
null
)
{
while
((
p
=
_getTopParent
(
parent
,
useFakeParent
))
!=
null
)
{
parent
=
p
parent
=
p
}
}
...
@@ -97,8 +96,8 @@ function openConfirmDialog (parent, options) {
...
@@ -97,8 +96,8 @@ function openConfirmDialog (parent, options) {
'
import QtQuick 2.7;
'
+
'
import QtQuick 2.7;
'
+
'
import Common 1.0;
'
+
'
import Common 1.0;
'
+
'
ConfirmDialog {
'
+
'
ConfirmDialog {
'
+
'
descriptionText:
\'
'
+
options
.
descriptionText
+
'
\'
;
'
+
'
descriptionText:
\'
'
+
escapeQuotes
(
options
.
descriptionText
)
+
'
\'
;
'
+
'
title:
\'
'
+
options
.
title
+
'
\'
'
+
'
title:
\'
'
+
escapeQuotes
(
options
.
title
)
+
'
\'
'
+
'
}
'
,
'
}
'
,
parent
,
{
parent
,
{
isString
:
true
,
isString
:
true
,
...
@@ -268,6 +267,14 @@ function ensureArray (obj) {
...
@@ -268,6 +267,14 @@ function ensureArray (obj) {
// -------------------------------------------------------------------
// -------------------------------------------------------------------
function
escapeQuotes
(
str
)
{
return
str
!=
null
?
str
.
replace
(
/
([^
'
\\]
*
(?:\\
.
[^
'
\\]
*
)
*
)
'/g
,
'
$1
\\\'
'
)
:
''
}
// -------------------------------------------------------------------
// Get the first matching value in a array or object.
// Get the first matching value in a array or object.
// The matching value is obtained if `cb` returns true.
// The matching value is obtained if `cb` returns true.
function
find
(
obj
,
cb
,
context
)
{
function
find
(
obj
,
cb
,
context
)
{
...
...
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