Changeset b15b3c1 in subsurface


Ignore:
Timestamp:
Jan 22, 2017, 6:20:03 PM (11 months ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
4cc4f5d
Parents:
0196d9a2
git-author:
Dirk Hohndel <dirk@…> (01/22/17 17:23:55)
git-committer:
Dirk Hohndel <dirk@…> (01/22/17 18:20:03)
Message:

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

Signed-off-by: Dirk Hohndel <dirk@…>

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • core/subsurface-qt/DiveObjectHelper.cpp

    r1219dc6 rb15b3c1  
    426426                        QStringList tempList = temp.split(sep);
    427427                        buddies << tempList;
    428                         buddies << "Multiple Buddies";
     428                        buddies << tr("Multiple Buddies");
    429429                }
    430430        }
  • mobile-widgets/qml/DiveDetails.qml

    r0196d9a2 rb15b3c1  
    158158                suitIndex = diveDetailsListView.currentItem.modelData.dive.suitList.indexOf(diveDetailsListView.currentItem.modelData.dive.suit)
    159159                if (diveDetailsListView.currentItem.modelData.dive.buddy.indexOf(",") > 0) {
    160                         buddyIndex = diveDetailsListView.currentItem.modelData.dive.buddyList.indexOf("Multiple Buddies");
     160                        buddyIndex = diveDetailsListView.currentItem.modelData.dive.buddyList.indexOf(qsTr("Multiple Buddies"));
    161161                } else {
    162162                        buddyIndex = diveDetailsListView.currentItem.modelData.dive.buddyList.indexOf(diveDetailsListView.currentItem.modelData.dive.buddy)
  • mobile-widgets/qml/DiveDetailsEdit.qml

    rbfaeb22 rb15b3c1  
    178178                        ComboBox {
    179179                                id: buddyBox
    180                                 editable: currentText != "Multiple Buddies"
     180                                editable: currentText != qsTr("Multiple Buddies")
    181181                                model: diveDetailsListView.currentItem.modelData.dive.buddyList
    182182                                inputMethodHints: Qt.ImhNoPredictiveText
  • mobile-widgets/qmlmanager.cpp

    r1219dc6 rb15b3c1  
    871871        if (myDive->buddy() != buddy) {
    872872                if (myDive->buddy().contains(",")) {
    873                         if (!buddy.contains("Multiple Buddies")) {
     873                        if (!buddy.contains(tr("Multiple Buddies"))) {
    874874                                diveChanged = true;
    875875                                free(d->buddy);
Note: See TracChangeset for help on using the changeset viewer.