djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make error messages platform agnostic

Browse Source 
Remove mentions of 'MicroPython' in error messages as they could lead to confusion in lesser-experienced users
This commit is contained in:
Hugo Dahl 2021-04-10 18:36:53 -05:00
parent 7471e978bb
commit 36f3897fe3
3 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
locale/circuitpython.pot
View File

@ -434,7 +434,7 @@ msgid "Attempt to allocate %d blocks"
msgstr "" msgstr ""
#: supervisor/shared/safe_mode.c #: supervisor/shared/safe_mode.c
msgid "Attempted heap allocation when MicroPython VM not running." msgid "Attempted heap allocation when VM not running."
msgstr "" msgstr ""
#: shared-bindings/wifi/Radio.c #: shared-bindings/wifi/Radio.c
@ -999,6 +999,10 @@ msgstr ""
msgid "Failed to write internal flash." msgid "Failed to write internal flash."
msgstr "" msgstr ""
#: supervisor/shared/safe_mode.c
msgid "Fatal error."
msgstr ""
#: py/moduerrno.c #: py/moduerrno.c
msgid "File exists" msgid "File exists"
msgstr "" msgstr ""
@ -1171,6 +1175,7 @@ msgstr ""
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
#: ports/mimxrt10xx/common-hal/busio/UART.c
msgid "Invalid %q pin" msgid "Invalid %q pin"
msgstr "" msgstr ""
@ -1386,14 +1391,6 @@ msgstr ""
msgid "Messages limited to 8 bytes" msgid "Messages limited to 8 bytes"
msgstr "" msgstr ""
#: supervisor/shared/safe_mode.c
msgid "MicroPython NLR jump failed. Likely memory corruption."
msgstr ""
#: supervisor/shared/safe_mode.c
msgid "MicroPython fatal error."
msgstr ""
#: shared-bindings/audiobusio/PDMIn.c #: shared-bindings/audiobusio/PDMIn.c
msgid "Microphone startup delay must be in range 0.0 to 1.0" msgid "Microphone startup delay must be in range 0.0 to 1.0"
msgstr "" msgstr ""
@ -1445,6 +1442,10 @@ msgstr ""
msgid "Must use a multiple of 6 rgb pins, not %d" msgid "Must use a multiple of 6 rgb pins, not %d"
msgstr "" msgstr ""
#: supervisor/shared/safe_mode.c
msgid "NLR jump failed. Likely memory corruption."
msgstr ""
#: ports/esp32s2/common-hal/nvm/ByteArray.c #: ports/esp32s2/common-hal/nvm/ByteArray.c
msgid "NVS Error" msgid "NVS Error"
msgstr "" msgstr ""
@ -1877,7 +1878,7 @@ msgstr ""
msgid "Read-only filesystem" msgid "Read-only filesystem"
msgstr "" msgstr ""
#: shared-module/bitmaptools/__init__.c shared-module/displayio/Bitmap.c #: shared-module/displayio/Bitmap.c
msgid "Read-only object" msgid "Read-only object"
msgstr "" msgstr ""
@ -1952,14 +1953,6 @@ msgstr ""
msgid "Scan already in progess. Stop with stop_scan." msgid "Scan already in progess. Stop with stop_scan."
msgstr "" msgstr ""
#: ports/mimxrt10xx/common-hal/busio/UART.c
msgid "Selected CTS pin not valid"
msgstr ""
#: ports/mimxrt10xx/common-hal/busio/UART.c
msgid "Selected RTS pin not valid"
msgstr ""
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
msgid "Serializer in use" msgid "Serializer in use"
@ -3193,6 +3186,10 @@ msgstr ""
msgid "invalid cert" msgid "invalid cert"
msgstr "" msgstr ""
#: py/compile.c
msgid "invalid decorator"
msgstr ""
#: extmod/uos_dupterm.c #: extmod/uos_dupterm.c
msgid "invalid dupterm index" msgid "invalid dupterm index"
msgstr "" msgstr ""

2
py/compile.c
View File

@ -768,7 +768,7 @@ STATIC bool compile_built_in_decorator(compiler_t *comp, int name_len, mp_parse_
} }
if (name_len != 2) { if (name_len != 2) {
compile_syntax_error(comp, name_nodes[0], translate("invalid micropython decorator")); compile_syntax_error(comp, name_nodes[0], translate("invalid decorator"));
return true; return true;
} }

6
supervisor/shared/safe_mode.c
View File

@ -170,13 +170,13 @@ void print_safe_mode_message(safe_mode_t reason) {
serial_write_compressed(translate("Crash into the HardFault_Handler.")); serial_write_compressed(translate("Crash into the HardFault_Handler."));
return; return;
case MICROPY_NLR_JUMP_FAIL: case MICROPY_NLR_JUMP_FAIL:
serial_write_compressed(translate("MicroPython NLR jump failed. Likely memory corruption.")); serial_write_compressed(translate("NLR jump failed. Likely memory corruption."));
return; return;
case MICROPY_FATAL_ERROR: case MICROPY_FATAL_ERROR:
serial_write_compressed(translate("MicroPython fatal error.")); serial_write_compressed(translate("Fatal error."));
break; break;
case GC_ALLOC_OUTSIDE_VM: case GC_ALLOC_OUTSIDE_VM:
serial_write_compressed(translate("Attempted heap allocation when MicroPython VM not running.")); serial_write_compressed(translate("Attempted heap allocation when VM not running."));
break; break;
#ifdef SOFTDEVICE_PRESENT #ifdef SOFTDEVICE_PRESENT
// defined in ports/nrf/bluetooth/bluetooth_common.mk // defined in ports/nrf/bluetooth/bluetooth_common.mk