8000 Merge pull request #10336 from jonnybergdahl/DupMessages · Neradoc/circuitpython@6bf42f1 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6bf42f1

Browse files
tannewttannewt
authored
Merge pull request adafruit#10336 from jonnybergdahl/DupMessages
Fix duplicated error messages
2 parents e44bd14 + a0ec6f8 commit 6bf42f1

File tree

6 files changed

+15
-23
lines changed

6 files changed

+15
-23
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ pseudoxml:
242242
.PHONY: all-source
243243
all-source:
244244

245-
TRANSLATE_CHECK_SUBMODULES=if ! [ -f extmod/ulab/README.md ]; then python tools/ci_fetch_deps.py translate; fi
245+
TRANSLATE_CHECK_SUBMODULES=if ! [ -f extmod/ulab/README.md ]; then $(PYTHON) tools/ci_fetch_deps.py translate; fi
246246
TRANSLATE_COMMAND=find $(TRANSLATE_SOURCES) -type d \( $(TRANSLATE_SOURCES_EXC) \) -prune -o -type f \( -iname "*.c" -o -iname "*.h" \) -print | (LC_ALL=C sort) | xgettext -x locale/synthetic.pot -f- -L C -s --add-location=file --keyword=MP_ERROR_TEXT -o - | sed -e '/"POT-Creation-Date: /d'
247247
locale/circuitpython.pot: all-source
248248
$(TRANSLATE_CHECK_SUBMODULES)

‎locale/circuitpython.pot

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,7 +1088,7 @@ msgstr ""
10881088
msgid "For RGB colorspaces, input bitmap must have 16 bits per pixel"
10891089
msgstr ""
10901090

1091-
#: ports/cxd56/common-hal/camera/Camera.c
1091+
#: ports/cxd56/common-hal/camera/Camera.c shared-module/audiocore/WaveFile.c
10921092
msgid "Format not supported"
10931093
msgstr ""
10941094

@@ -2300,10 +2300,6 @@ msgstr ""
23002300
msgid "Unsupported display bus type"
23012301
msgstr ""
23022302

2303-
#: shared-module/audiocore/WaveFile.c
2304-
msgid "Unsupported format"
2305-
msgstr ""
2306-
23072303
#: shared-bindings/hashlib/__init__.c
23082304
msgid "Unsupported hash algorithm"
23092305
msgstr ""
@@ -2360,8 +2356,10 @@ msgstr ""
23602356
msgid "Wi-Fi: "
23612357
msgstr ""
23622358

2359+
#: ports/espressif/common-hal/wifi/Radio.c
23632360
#: ports/raspberrypi/common-hal/wifi/Radio.c
2364-
msgid "Wifi is not enabled"
2361+
#: ports/zephyr-cp/common-hal/wifi/Radio.c
2362+
msgid "WiFi is not enabled"
23652363
msgstr ""
23662364

23672365
#: main.c
@@ -4392,12 +4390,6 @@ msgstr ""
43924390
msgid "width must be greater than zero"
43934391
msgstr ""
43944392

4395-
#: ports/espressif/common-hal/wifi/Radio.c
4396-
#: ports/raspberrypi/common-hal/wifi/Radio.c
4397-
#: ports/zephyr-cp/common-hal/wifi/Radio.c
4398-
msgid "wifi is not enabled"
4399-
msgstr ""
4400-
44014393
#: ports/raspberrypi/common-hal/wifi/Monitor.c
44024394
msgid "wifi.Monitor not available"
44034395
msgstr ""

‎ports/espressif/common-hal/wifi/Radio.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ mp_obj_t common_hal_wifi_radio_start_scanning_networks(wifi_radio_obj_t *self, u
200200
mp_raise_RuntimeError(MP_ERROR_TEXT("Already scanning for wifi networks"));
201201
}
202202
if (!common_hal_wifi_radio_get_enabled(self)) {
203-
mp_raise_RuntimeError(MP_ERROR_TEXT("wifi is not enabled"));
203+
mp_raise_RuntimeError(MP_ERROR_TEXT("WiFi is not enabled"));
204204
}
205205
set_mode_station(self, true);
206206

@@ -319,7 +319,7 @@ mp_obj_t common_hal_wifi_radio_get_stations_ap(wifi_radio_obj_t *self) {
319319

320320
wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t *bssid, size_t bssid_len) {
321321
if (!common_hal_wifi_radio_get_enabled(self)) {
322-
mp_raise_RuntimeError(MP_ERROR_TEXT("wifi is not enabled"));
322+
mp_raise_RuntimeError(MP_ERROR_TEXT("WiFi is not enabled"));
323323
}
324324
wifi_config_t *config = &self->sta_config;
325325

‎ports/raspberrypi/common-hal/wifi/Radio.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ mp_obj_t common_hal_wifi_radio_start_scanning_networks(wifi_radio_obj_t *self, u
157157
mp_raise_RuntimeError(MP_ERROR_TEXT("Already scanning for wifi networks"));
158158
}
159159
if (!common_hal_wifi_radio_get_enabled(self)) {
160-
mp_raise_RuntimeError(MP_ERROR_TEXT("Wifi is not enabled"));
160+
mp_raise_RuntimeError(MP_ERROR_TEXT("WiFi is not enabled"));
161161
}
162162
wifi_scannednetworks_obj_t *scan = mp_obj_malloc(wifi_scannednetworks_obj_t, &wifi_scannednetworks_type);
163163
mp_obj_t args[] = { mp_const_empty_tuple, MP_OBJ_NEW_SMALL_INT(16) };
@@ -193,7 +193,7 @@ void common_hal_wifi_radio_stop_station(wifi_radio_obj_t *self) {
193193

194194
void common_hal_wifi_radio_start_ap(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, uint32_t authmode, uint8_t max_connections) {
195195
if (!common_hal_wifi_radio_get_enabled(self)) {
196-
mp_raise_RuntimeError(MP_ERROR_TEXT("Wifi is not enabled"));
196+
mp_raise_RuntimeError(MP_ERROR_TEXT("WiFi is not enabled"));
197197
}
198198

199199
/* TODO: If the AP is stopped once it cannot be restarted.
@@ -243,7 +243,7 @@ bool common_hal_wifi_radio_get_ap_active(wifi_radio_obj_t *self) {
243243

244244
void common_hal_wifi_radio_stop_ap(wifi_radio_obj_t *self) {
245245
if (!common_hal_wifi_radio_get_enabled(self)) {
246-
mp_raise_RuntimeError(MP_ERROR_TEXT("wifi is not enabled"));
246+
mp_raise_RuntimeError(MP_ERROR_TEXT("WiFi is not enabled"));
247247
}
248248

249249
cyw43_arch_disable_ap_mode();
@@ -321,7 +321,7 @@ static bool connection_unchanged(wifi_radio_obj_t *self, const uint8_t *ssid, si
321321

322322
wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t *bssid, size_t bssid_len) {
323323
if (!common_hal_wifi_radio_get_enabled(self)) {
324-
mp_raise_RuntimeError(MP_ERROR_TEXT("Wifi is not enabled"));
324+
mp_raise_RuntimeError(MP_ERROR_TEXT("WiFi is not enabled"));
325325
}
326326

327327
if (ssid_len > 32) {

‎ports/zephyr-cp/common-hal/wifi/Radio.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,8 @@ mp_obj_t common_hal_wifi_radio_start_scanning_networks(wifi_radio_obj_t *self, u
214214
mp_raise_RuntimeError(MP_ERROR_TEXT("Already scanning for wifi networks"));
215215
}
216216
if (!common_hal_wifi_radio_get_enabled(self)) {
217-
printk("wifi is not enabled\n");
218-
mp_raise_RuntimeError(MP_ERROR_TEXT("wifi is not enabled"));
217+
printk("WiFi is not enabled\n");
218+
mp_raise_RuntimeError(MP_ERROR_TEXT("WiFi is not enabled"));
219219
}
220220

221221
wifi_scannednetworks_obj_t *scan = mp_obj_malloc(wifi_scannednetworks_obj_t, &wifi_scannednetworks_type);
@@ -349,7 +349,7 @@ mp_obj_t common_hal_wifi_radio_get_stations_ap(wifi_radio_obj_t *self) {
349349

350350
wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t *ssid, size_t ssid_len, uint8_t *password, size_t password_len, uint8_t channel, mp_float_t timeout, uint8_t *bssid, size_t bssid_len) {
351351
if (!common_hal_wifi_radio_get_enabled(self)) {
352-
mp_raise_RuntimeError(MP_ERROR_TEXT("wifi is not enabled"));
352+
mp_raise_RuntimeError(MP_ERROR_TEXT("WiFi is not enabled"));
353353
}
354354
// wifi_config_t *config = &self->sta_config;
355355

‎shared-module/audiocore/WaveFile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ void common_hal_audioio_wavefile_construct(audioio_wavefile_obj_t *self,
6969
(format.audio_format != 0xfffe ||
7070
format.extended_audio_format != 1 ||
7171
format.valid_bits_per_sample != format.bits_per_sample))) {
72-
mp_raise_ValueError(MP_ERROR_TEXT("Unsupported format"));
72+
mp_raise_ValueError(MP_ERROR_TEXT("Format not supported"));
7373
}
7474
// Get the sample_rate
7575
self->base.sample_rate = format.sample_rate;

0 commit comments

Comments
 (0)
0