Skip to content

Commit 10a022d

Browse files
dhalbertdhalbert
committed
consolidate and shorten some error messages
1 parent 7933bb0 commit 10a022d

9 files changed

Lines changed: 23 additions & 27 deletions

File tree

‎locale/circuitpython.pot‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ msgstr ""
3131
#: supervisor/shared/safe_mode.c
3232
msgid ""
3333
"\n"
34-
"Please file an issue with your program at https://github.com/adafruit/"
35-
"circuitpython/issues."
34+
"Please file an issue with your program at github.com/adafruit/circuitpython/"
35+
"issues."
3636
msgstr ""
3737

3838
#: supervisor/shared/safe_mode.c
@@ -633,11 +633,6 @@ msgstr ""
633633
msgid "Buffer is not a bytearray."
634634
msgstr ""
635635

636-
#: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c
637-
#: shared-bindings/framebufferio/FramebufferDisplay.c
638-
msgid "Buffer is too small"
639-
msgstr ""
640-
641636
#: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
642637
#, c-format
643638
msgid "Buffer length %d too big. It must be less than %d"
@@ -657,6 +652,12 @@ msgstr ""
657652
msgid "Buffer too short by %d bytes"
658653
msgstr ""
659654

655+
#: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c
656+
#: shared-bindings/framebufferio/FramebufferDisplay.c
657+
#: shared-bindings/struct/__init__.c shared-module/struct/__init__.c
658+
msgid "Buffer too small"
659+
msgstr ""
660+
660661
#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c
661662
msgid "Buffers must be same size"
662663
msgstr ""
@@ -1786,6 +1787,10 @@ msgstr ""
17861787
msgid "Polygon needs at least 3 points"
17871788
msgstr ""
17881789

1790+
#: supervisor/shared/safe_mode.c
1791+
msgid "Power dipped. Make sure you are providing enough power."
1792+
msgstr ""
1793+
17891794
#: shared-bindings/_bleio/Adapter.c
17901795
msgid "Prefix buffer must be on the heap"
17911796
msgstr ""
@@ -2016,10 +2021,6 @@ msgstr ""
20162021
msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
20172022
msgstr ""
20182023

2019-
#: supervisor/shared/safe_mode.c
2020-
msgid "The power dipped. Make sure you are providing enough power."
2021-
msgstr ""
2022-
20232024
#: shared-module/audiomixer/MixerVoice.c
20242025
msgid "The sample's bits_per_sample does not match the mixer's"
20252026
msgstr ""
@@ -2605,8 +2606,7 @@ msgstr ""
26052606
msgid "buffer slices must be of equal length"
26062607
msgstr ""
26072608

2608-
#: py/modstruct.c shared-bindings/struct/__init__.c
2609-
#: shared-module/struct/__init__.c
2609+
#: py/modstruct.c shared-module/struct/__init__.c
26102610
msgid "buffer too small"
26112611
msgstr ""
26122612

@@ -3863,10 +3863,6 @@ msgstr ""
38633863
msgid "pixel coordinates out of bounds"
38643864
msgstr ""
38653865

3866-
#: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
3867-
msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
3868-
msgstr ""
3869-
38703866
#: extmod/vfs_posix_file.c
38713867
msgid "poll on file not available on win32"
38723868
msgstr ""

‎ports/cxd56/common-hal/camera/Camera.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ size_t common_hal_camera_take_picture(camera_obj_t *self, uint8_t *buffer, size_
184184
mp_raise_ValueError(translate("Size not supported"));
185185
}
186186
if (!camera_check_buffer_length(width, height, format, len)) {
187-
mp_raise_ValueError(translate("Buffer is too small"));
187+
mp_raise_ValueError(translate("Buffer too small"));
188188
}
189189
if (!camera_check_format(format)) {
190190
mp_raise_ValueError(translate("Format not supported"));

‎shared-bindings/displayio/Display.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ STATIC mp_obj_t displayio_display_obj_fill_row(size_t n_args, const mp_obj_t *po
506506
displayio_display_core_fill_area(&self->core, &area, mask, result_buffer);
507507
return result;
508508
} else {
509-
mp_raise_ValueError(translate("Buffer is too small"));
509+
mp_raise_ValueError(translate("Buffer too small"));
510510
}
511511
}
512512
MP_DEFINE_CONST_FUN_OBJ_KW(displayio_display_fill_row_obj, 1, displayio_display_obj_fill_row);

‎shared-bindings/displayio/TileGrid.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(displayio_tilegrid_get_pixel_shader_obj, displayio_til
351351
STATIC mp_obj_t displayio_tilegrid_obj_set_pixel_shader(mp_obj_t self_in, mp_obj_t pixel_shader) {
352352
displayio_tilegrid_t *self = native_tilegrid(self_in);
353353
if (!mp_obj_is_type(pixel_shader, &displayio_palette_type) && !mp_obj_is_type(pixel_shader, &displayio_colorconverter_type)) {
354-
mp_raise_TypeError(translate("pixel_shader must be displayio.Palette or displayio.ColorConverter"));
354+
mp_raise_TypeError_varg(translate("unsupported %q type"), MP_QSTR_pixel_shader);
355355
}
356356

357357
common_hal_displayio_tilegrid_set_pixel_shader(self, pixel_shader);

‎shared-bindings/framebufferio/FramebufferDisplay.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_fill_row(size_t n_args, con
317317
displayio_display_core_fill_area(&self->core, &area, mask, result_buffer);
318318
return result;
319319
} else {
320-
mp_raise_ValueError(translate("Buffer is too small"));
320+
mp_raise_ValueError(translate("Buffer too small"));
321321
}
322322
}
323323
MP_DEFINE_CONST_FUN_OBJ_KW(framebufferio_framebufferdisplay_fill_row_obj, 1, framebufferio_framebufferdisplay_obj_fill_row);

‎shared-bindings/struct/__init__.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ STATIC mp_obj_t struct_pack_into(size_t n_args, const mp_obj_t *args) {
9292
// negative offsets are relative to the end of the buffer
9393
offset = (mp_int_t)bufinfo.len + offset;
9494
if (offset < 0) {
95-
mp_raise_RuntimeError(translate("buffer too small"));
95+
mp_raise_RuntimeError(translate("Buffer too small"));
9696
}
9797
}
9898
byte *p = (byte *)bufinfo.buf;
@@ -151,7 +151,7 @@ STATIC mp_obj_t struct_unpack_from(size_t n_args, const mp_obj_t *pos_args, mp_m
151151
// negative offsets are relative to the end of the buffer
152152
offset = bufinfo.len + offset;
153153
if (offset < 0) {
154-
mp_raise_RuntimeError(translate("buffer too small"));
154+
mp_raise_RuntimeError(translate("Buffer too small"));
155155
}
156156
}
157157
p += offset;

‎shared-bindings/vectorio/VectorShape.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ STATIC mp_obj_t vectorio_vector_shape_obj_set_pixel_shader(mp_obj_t wrapper_shap
226226
vectorio_vector_shape_t *self = MP_OBJ_TO_PTR(draw_protocol->draw_get_protocol_self(wrapper_shape));
227227

228228
if (!mp_obj_is_type(pixel_shader, &displayio_palette_type) && !mp_obj_is_type(pixel_shader, &displayio_colorconverter_type)) {
229-
mp_raise_TypeError(translate("pixel_shader must be displayio.Palette or displayio.ColorConverter"));
229+
mp_raise_TypeError_varg(translate("unsupported %q type"), MP_QSTR_pixel_shader);
230230
}
231231

232232
common_hal_vectorio_vector_shape_set_pixel_shader(self, pixel_shader);

‎shared-module/struct/__init__.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ void shared_modules_struct_pack_into(mp_obj_t fmt_in, byte *p, byte *end_p, size
126126
const mp_uint_t total_sz = shared_modules_struct_calcsize(fmt_in);
127127

128128
if (p + total_sz > end_p) {
129-
mp_raise_RuntimeError(translate("buffer too small"));
129+
mp_raise_RuntimeError(translate("Buffer too small"));
130130
}
131131

132132
size_t i = 0;

‎supervisor/shared/safe_mode.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ void print_safe_mode_message(safe_mode_t reason) {
154154

155155
switch (reason) {
156156
case SAFE_MODE_BROWNOUT:
157-
message = translate("The power dipped. Make sure you are providing enough power.");
157+
message = translate("Power dipped. Make sure you are providing enough power.");
158158
break;
159159
case SAFE_MODE_USER:
160160
#if defined(BOARD_USER_SAFE_MODE_ACTION)
@@ -228,7 +228,7 @@ void print_safe_mode_message(safe_mode_t reason) {
228228
break;
229229
}
230230
serial_write_compressed(message);
231-
serial_write_compressed(translate("\nPlease file an issue with your program at https://github.com/adafruit/circuitpython/issues."));
231+
serial_write_compressed(translate("\nPlease file an issue with your program at github.com/adafruit/circuitpython/issues."));
232232
}
233233

234234
// Always tell user how to get out of safe mode.

0 commit comments

Comments
 (0)