Skip to content

Commit

Permalink
Merge pull request #2276 from barton2526/typo
Browse files Browse the repository at this point in the history
lint: Fix linter warning, fix typo
  • Loading branch information
jamescowens committed Aug 16, 2021
2 parents 5102708 + 41292bb commit 9e7be42
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion share/qt/extract_strings_qt.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def parse_po(text):

messages = parse_po(out.decode('utf-8'))

f = open(OUT_CPP, 'w')
f = open(OUT_CPP, 'w', encoding="utf-8")
f.write("""
#include <QtGlobal>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/sendcoinsdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ void SendCoinsDialog::selectedConsolidationRecipient(SendCoinsRecipient consolid
}

// The AddressTableModel substitutes the translated "(no label)" when the label is empty. If we use
// that here, we will end up pasting a literal lable of "(no label)". Because the translation (tr) should
// that here, we will end up pasting a literal label of "(no label)". Because the translation (tr) should
// be consistent between here and the AddressTableModel::data, it should match the conditional and be put
// back to the desired empty QString.
if (consolidationRecipient.label == tr("(no label)")) consolidationRecipient.label = QString();
Expand Down
2 changes: 1 addition & 1 deletion test/lint/lint-shell.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ fi

SHELLCHECK_CMD=(shellcheck --external-sources --check-sourced)
EXCLUDE="--exclude=$(IFS=','; echo "${disabled[*]}")"
if ! "${SHELLCHECK_CMD[@]}" "$EXCLUDE" $(git ls-files -- '*.sh' | grep -vE 'src/(leveldb|secp256k1|univalue)/'); then
if ! "${SHELLCHECK_CMD[@]}" "$EXCLUDE" $(git ls-files -- '*.sh' | grep -vE 'src/(leveldb|secp256k1|univalue)/|contrib/rpcstresstest/'); then
EXIT_CODE=1
fi

Expand Down

0 comments on commit 9e7be42

Please sign in to comment.