Merge pull request micropython#4589 from hugodahl/feature/Remove-MicroPython-mention-in-error-messages

dhalbert · web-flow · commit c333acdbad13 · 2021-04-10T21:30:17.000-04:00
Make error messages platform agnostic
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
@@ -438,7 +438,7 @@ msgid "Attempt to allocate %d blocks"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "Attempted heap allocation when MicroPython VM not running."
+msgid "Attempted heap allocation when VM not running."
 msgstr ""
 
 #: shared-bindings/wifi/Radio.c
@@ -1008,6 +1008,10 @@ msgstr ""
 msgid "Failed to write internal flash."
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "Fatal error."
+msgstr ""
+
 #: py/moduerrno.c
 msgid "File exists"
 msgstr ""
@@ -1398,14 +1402,6 @@ msgstr ""
 msgid "Messages limited to 8 bytes"
 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
 msgid "Microphone startup delay must be in range 0.0 to 1.0"
 msgstr ""
@@ -1457,6 +1453,10 @@ msgstr ""
 msgid "Must use a multiple of 6 rgb pins, not %d"
 msgstr ""
 
+#: supervisor/shared/safe_mode.c
+msgid "NLR jump failed. Likely memory corruption."
+msgstr ""
+
 #: ports/esp32s2/common-hal/nvm/ByteArray.c
 msgid "NVS Error"
 msgstr ""
@@ -3194,6 +3194,10 @@ msgstr ""
 msgid "invalid cert"
 msgstr ""
 
+#: py/compile.c
+msgid "invalid decorator"
+msgstr ""
+
 #: extmod/uos_dupterm.c
 msgid "invalid dupterm index"
 msgstr ""
diff --git a/py/compile.c b/py/compile.c
@@ -768,7 +768,7 @@ STATIC bool compile_built_in_decorator(compiler_t *comp, int name_len, mp_parse_
     }
 
     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;
     }
 
diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c
@@ -170,13 +170,13 @@ void print_safe_mode_message(safe_mode_t reason) {
             serial_write_compressed(translate("Crash into the HardFault_Handler."));
             return;
         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;
         case MICROPY_FATAL_ERROR:
-            serial_write_compressed(translate("MicroPython fatal error."));
+            serial_write_compressed(translate("Fatal error."));
             break;
         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;
             #ifdef SOFTDEVICE_PRESENT
         // defined in ports/nrf/bluetooth/bluetooth_common.mk

Original file line number	Diff line number	Diff line change
`@@ -768,7 +768,7 @@ STATIC bool compile_built_in_decorator(compiler_t *comp, int name_len, mp_parse_`
`768`	`768`	`}`
`769`	`769`
`770`	`770`	`if (name_len != 2) {`
`771`		`- compile_syntax_error(comp, name_nodes[0], translate("invalid micropython decorator"));`
	`771`	`+ compile_syntax_error(comp, name_nodes[0], translate("invalid decorator"));`
`772`	`772`	`return true;`
`773`	`773`	`}`
`774`	`774`