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
cf938262
Commit
cf938262
authored
Apr 05, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(src/app/translator/DefaultTranslator): ignore qrc QtQuick files
parent
f50be474
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
App.cpp
linphone-desktop/src/app/App.cpp
+1
-1
DefaultTranslator.cpp
linphone-desktop/src/app/translator/DefaultTranslator.cpp
+9
-2
No files found.
linphone-desktop/src/app/App.cpp
View file @
cf938262
...
@@ -92,7 +92,7 @@ App::App (int &argc, char *argv[]) : SingleApplication(argc, argv, true) {
...
@@ -92,7 +92,7 @@ App::App (int &argc, char *argv[]) : SingleApplication(argc, argv, true) {
}
}
App
::~
App
()
{
App
::~
App
()
{
qInfo
()
<<
"Destroying app..."
;
qInfo
()
<<
QStringLiteral
(
"Destroying app..."
)
;
}
}
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
...
...
linphone-desktop/src/app/translator/DefaultTranslator.cpp
View file @
cf938262
...
@@ -34,8 +34,12 @@ DefaultTranslator::DefaultTranslator (QObject *parent) : QTranslator(parent) {
...
@@ -34,8 +34,12 @@ DefaultTranslator::DefaultTranslator (QObject *parent) : QTranslator(parent) {
if
(
info
.
suffix
()
==
"qml"
)
{
if
(
info
.
suffix
()
==
"qml"
)
{
// Ignore extra selectors.
// Ignore extra selectors.
QString
dir
=
info
.
absoluteDir
().
dirName
();
QString
dir
=
info
.
absoluteDir
().
absolutePath
();
if
(
dir
==
"+linux"
||
dir
==
"+mac"
||
dir
==
"+windows"
)
if
(
dir
.
contains
(
"+linux"
)
||
dir
.
contains
(
"+mac"
)
||
dir
.
contains
(
"+windows"
))
continue
;
// Ignore default imports.
if
(
dir
.
startsWith
(
":/QtQuick"
))
continue
;
continue
;
QString
basename
=
info
.
baseName
();
QString
basename
=
info
.
baseName
();
...
@@ -53,6 +57,9 @@ QString DefaultTranslator::translate (
...
@@ -53,6 +57,9 @@ QString DefaultTranslator::translate (
const
char
*
disambiguation
,
const
char
*
disambiguation
,
int
n
int
n
)
const
{
)
const
{
if
(
!
context
)
return
QStringLiteral
(
""
);
QString
translation
=
QTranslator
::
translate
(
context
,
source_text
,
disambiguation
,
n
);
QString
translation
=
QTranslator
::
translate
(
context
,
source_text
,
disambiguation
,
n
);
if
(
translation
.
length
()
==
0
&&
m_contexts
.
contains
(
context
))
if
(
translation
.
length
()
==
0
&&
m_contexts
.
contains
(
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