mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

QML UI: allow magic phrase for multiple buddies to be localized

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-01-22 17:23:55 -08:00
parent 0196d9a220
commit b15b3c195c
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/subsurface-qt/DiveObjectHelper.cpp
View file

@ -425,7 +425,7 @@ QStringList DiveObjectHelper::buddyList() const
QRegExp sep("(,\\s)"); QRegExp sep("(,\\s)");
QStringList tempList = temp.split(sep); QStringList tempList = temp.split(sep);
buddies << tempList; buddies << tempList;
buddies << "Multiple Buddies"; buddies << tr("Multiple Buddies");
} }
} }
buddies.removeDuplicates(); buddies.removeDuplicates();

2
mobile-widgets/qml/DiveDetails.qml
View file

@ -157,7 +157,7 @@ Kirigami.Page {
watertemp = diveDetailsListView.currentItem.modelData.dive.waterTemp watertemp = diveDetailsListView.currentItem.modelData.dive.waterTemp
suitIndex = diveDetailsListView.currentItem.modelData.dive.suitList.indexOf(diveDetailsListView.currentItem.modelData.dive.suit) suitIndex = diveDetailsListView.currentItem.modelData.dive.suitList.indexOf(diveDetailsListView.currentItem.modelData.dive.suit)
if (diveDetailsListView.currentItem.modelData.dive.buddy.indexOf(",") > 0) { if (diveDetailsListView.currentItem.modelData.dive.buddy.indexOf(",") > 0) {
buddyIndex = diveDetailsListView.currentItem.modelData.dive.buddyList.indexOf("Multiple Buddies"); buddyIndex = diveDetailsListView.currentItem.modelData.dive.buddyList.indexOf(qsTr("Multiple Buddies"));
} else { } else {
buddyIndex = diveDetailsListView.currentItem.modelData.dive.buddyList.indexOf(diveDetailsListView.currentItem.modelData.dive.buddy) buddyIndex = diveDetailsListView.currentItem.modelData.dive.buddyList.indexOf(diveDetailsListView.currentItem.modelData.dive.buddy)
} }

2
mobile-widgets/qml/DiveDetailsEdit.qml
View file

@ -177,7 +177,7 @@ Item {
} }
ComboBox { ComboBox {
id: buddyBox id: buddyBox
editable: currentText != "Multiple Buddies" editable: currentText != qsTr("Multiple Buddies")
model: diveDetailsListView.currentItem.modelData.dive.buddyList model: diveDetailsListView.currentItem.modelData.dive.buddyList
inputMethodHints: Qt.ImhNoPredictiveText inputMethodHints: Qt.ImhNoPredictiveText
Layout.fillWidth: true Layout.fillWidth: true

2
mobile-widgets/qmlmanager.cpp
View file

@ -870,7 +870,7 @@ void QMLManager::commitChanges(QString diveId, QString date, QString location, Q
} }
if (myDive->buddy() != buddy) { if (myDive->buddy() != buddy) {
if (myDive->buddy().contains(",")) { if (myDive->buddy().contains(",")) {
if (!buddy.contains("Multiple Buddies")) { if (!buddy.contains(tr("Multiple Buddies"))) {
diveChanged = true; diveChanged = true;
free(d->buddy); free(d->buddy);
d->buddy = strdup(qPrintable(buddy)); d->buddy = strdup(qPrintable(buddy));