mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correct divesite geocoding translation

Browse source 
See https://github.com/Subsurface-divelog/subsurface/issues/345. The
menues where not translated. The basis of this error is a simple
typo in core/taxonomy.c where the classname was mis-spelled in the
QT_TRANSLATE_NOOP. In addition, to pull and translate the strings
from C code, the normal tr() does not work, and the functionality
from the gettextfromc class is used.

Fixes: #345

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2017-04-25 23:16:46 +02:00 committed by Dirk Hohndel
parent dc9cf7bcbc
commit 12a59ef313
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/taxonomy.c
View file

@ -3,13 +3,13 @@
#include <stdlib.h> #include <stdlib.h>
char *taxonomy_category_names[TC_NR_CATEGORIES] = { char *taxonomy_category_names[TC_NR_CATEGORIES] = {
QT_TRANSLATE_NOOP("getTextFromC", "None"), QT_TRANSLATE_NOOP("gettextFromC", "None"),
QT_TRANSLATE_NOOP("getTextFromC", "Ocean"), QT_TRANSLATE_NOOP("gettextFromC", "Ocean"),
QT_TRANSLATE_NOOP("getTextFromC", "Country"), QT_TRANSLATE_NOOP("gettextFromC", "Country"),
QT_TRANSLATE_NOOP("getTextFromC", "State"), QT_TRANSLATE_NOOP("gettextFromC", "State"),
QT_TRANSLATE_NOOP("getTextFromC", "County"), QT_TRANSLATE_NOOP("gettextFromC", "County"),
QT_TRANSLATE_NOOP("getTextFromC", "Town"), QT_TRANSLATE_NOOP("gettextFromC", "Town"),
QT_TRANSLATE_NOOP("getTextFromC", "City") QT_TRANSLATE_NOOP("gettextFromC", "City")
}; };
// these are the names for geoname.org // these are the names for geoname.org

3
qt-models/divelocationmodel.cpp
View file

@ -4,6 +4,7 @@
#include <QDebug> #include <QDebug>
#include <QLineEdit> #include <QLineEdit>
#include <QIcon> #include <QIcon>
#include <core/gettextfromc.h>
bool dive_site_less_than(dive_site *a, dive_site *b) bool dive_site_less_than(dive_site *a, dive_site *b)
{ {
@ -184,7 +185,7 @@ GeoReferencingOptionsModel::GeoReferencingOptionsModel(QObject *parent) : QStrin
QStringList list; QStringList list;
int i; int i;
for (i = 0; i < TC_NR_CATEGORIES; i++) for (i = 0; i < TC_NR_CATEGORIES; i++)
list << taxonomy_category_names[i]; list << gettextFromC::instance()->trGettext(taxonomy_category_names[i]);
setStringList(list); setStringList(list);
} }