Skip to content

Commit 9e7be42

Browse files
authored
Merge pull request #2276 from barton2526/typo
lint: Fix linter warning, fix typo
2 parents 5102708 + 41292bb commit 9e7be42

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

share/qt/extract_strings_qt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def parse_po(text):
6464

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

67-
f = open(OUT_CPP, 'w')
67+
f = open(OUT_CPP, 'w', encoding="utf-8")
6868
f.write("""
6969
7070
#include <QtGlobal>

src/qt/sendcoinsdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ void SendCoinsDialog::selectedConsolidationRecipient(SendCoinsRecipient consolid
504504
}
505505

506506
// The AddressTableModel substitutes the translated "(no label)" when the label is empty. If we use
507-
// that here, we will end up pasting a literal lable of "(no label)". Because the translation (tr) should
507+
// that here, we will end up pasting a literal label of "(no label)". Because the translation (tr) should
508508
// be consistent between here and the AddressTableModel::data, it should match the conditional and be put
509509
// back to the desired empty QString.
510510
if (consolidationRecipient.label == tr("(no label)")) consolidationRecipient.label = QString();

test/lint/lint-shell.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ fi
2828

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

0 commit comments

Comments
 (0)