Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
meta-nemo
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
NemoMobile
meta-nemo
Commits
b8401008
Commit
b8401008
authored
Mar 18, 2018
by
Florent Revest
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mlite: Fix localized values when locales are long (for instance de_DE or nb_NO)
parent
26e2371c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
0001-MDesktopEntry-Allow-dynamic-locale-switch-by-disabli.patch
...DesktopEntry-Allow-dynamic-locale-switch-by-disabli.patch
+6
-6
No files found.
recipes-nemomobile/mlite/mlite/0001-MDesktopEntry-Allow-dynamic-locale-switch-by-disabli.patch
View file @
b8401008
From
0ec6c5c9751557907a93ee755ba1e5a891352dc
5 Mon Sep 17 00:00:00 2001
From
5cf25750cd18c33634ef123c6375cf9c348fb68
5 Mon Sep 17 00:00:00 2001
From: Florent Revest <revestflo@gmail.com>
From: Florent Revest <revestflo@gmail.com>
Date:
Thu, 30 Nov 2017 22:02:48
+0100
Date:
Sun, 18 Mar 2018 01:22:54
+0100
Subject: [PATCH] MDesktopEntry: Allow dynamic locale switch by disabling some
Subject: [PATCH] MDesktopEntry: Allow dynamic locale switch by disabling some
of the asumptions made when using glib's conf files functions
of the asumptions made when using glib's conf files functions
...
@@ -9,7 +9,7 @@ Subject: [PATCH] MDesktopEntry: Allow dynamic locale switch by disabling some
...
@@ -9,7 +9,7 @@ Subject: [PATCH] MDesktopEntry: Allow dynamic locale switch by disabling some
1 file changed, 3 insertions(+), 6 deletions(-)
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/mdesktopentry.cpp b/src/mdesktopentry.cpp
diff --git a/src/mdesktopentry.cpp b/src/mdesktopentry.cpp
index
cca6af0..628eaab
100644
index
3c976d5..2f25685
100644
--- a/src/mdesktopentry.cpp
--- a/src/mdesktopentry.cpp
+++ b/src/mdesktopentry.cpp
+++ b/src/mdesktopentry.cpp
@@ -66,7 +66,7 @@
bool GKeyFileWrapper::load(QIODevice &device)
@@ -66,7 +66,7 @@
bool GKeyFileWrapper::load(QIODevice &device)
...
@@ -25,7 +25,7 @@ index cca6af0..628eaab 100644
...
@@ -25,7 +25,7 @@ index cca6af0..628eaab 100644
QByteArray section_utf8 = section.toUtf8();
QByteArray section_utf8 = section.toUtf8();
QByteArray key_utf8 = key.toUtf8();
QByteArray key_utf8 = key.toUtf8();
+ QByteArray locale_utf8 =
QLocale().bcp47Name().toUtf8(
);
+ QByteArray locale_utf8 =
qgetenv("LANG"
);
GError *err = NULL;
GError *err = NULL;
- gchar *value = g_key_file_get_locale_string(m_key_file, section_utf8.constData(), key_utf8.constData(), NULL, &err);
- gchar *value = g_key_file_get_locale_string(m_key_file, section_utf8.constData(), key_utf8.constData(), NULL, &err);
...
@@ -33,7 +33,7 @@ index cca6af0..628eaab 100644
...
@@ -33,7 +33,7 @@ index cca6af0..628eaab 100644
if (!value) {
if (!value) {
qWarning() << "Could not read value:" << QString::fromUtf8(err->message);
qWarning() << "Could not read value:" << QString::fromUtf8(err->message);
g_clear_error(&err);
g_clear_error(&err);
@@ -4
08,9 +409
,6 @@
QString MDesktopEntry::name() const
@@ -4
11,9 +412
,6 @@
QString MDesktopEntry::name() const
{
{
Q_D(const MDesktopEntry);
Q_D(const MDesktopEntry);
...
@@ -43,7 +43,7 @@ index cca6af0..628eaab 100644
...
@@ -43,7 +43,7 @@ index cca6af0..628eaab 100644
QString name;
QString name;
if (contains(DesktopEntrySection, LogicalIdKey)) {
if (contains(DesktopEntrySection, LogicalIdKey)) {
@@ -43
2,7 +430
,6 @@
QString MDesktopEntry::name() const
@@ -43
5,7 +433
,6 @@
QString MDesktopEntry::name() const
name = d->keyFile.localizedValue(DesktopEntrySection, NameKey);
name = d->keyFile.localizedValue(DesktopEntrySection, NameKey);
}
}
...
...
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