Skip to content

Commit d3ce928

Browse files
authored
Merge pull request adafruit#1883 from tannewt/fix_1881
Check native object in case of early access
2 parents c6c6171 + e74f5d5 commit d3ce928

File tree

20 files changed

+592
-510
lines changed

20 files changed

+592
-510
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ pseudoxml:
196196
all-source:
197197

198198
locale/circuitpython.pot: all-source
199-
find $(TRANSLATE_SOURCES) -iname "*.c" | xargs xgettext -L C -s --add-location=file --keyword=translate -o circuitpython.pot -p locale
199+
find $(TRANSLATE_SOURCES) -iname "*.c" -print0 | sort -z | xargs -0 xgettext -L C -s --add-location=file --keyword=translate -o circuitpython.pot -p locale
200200

201201
translate: locale/circuitpython.pot
202202
for po in $(shell ls locale/*.po); do msgmerge -U $$po -s --no-fuzzy-matching --add-location=file locale/circuitpython.pot; done

locale/ID.po

Lines changed: 45 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2019-05-12 09:42-0400\n"
11+
"POT-Creation-Date: 2019-05-13 17:34-0700\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -52,8 +52,8 @@ msgstr ""
5252
msgid "%q indices must be integers, not %s"
5353
msgstr ""
5454

55-
#: shared-bindings/displayio/Shape.c shared-bindings/displayio/Group.c
5655
#: shared-bindings/bleio/CharacteristicBuffer.c
56+
#: shared-bindings/displayio/Group.c shared-bindings/displayio/Shape.c
5757
#, fuzzy
5858
msgid "%q must be >= 1"
5959
msgstr "buffers harus mempunyai panjang yang sama"
@@ -70,12 +70,12 @@ msgstr "%q() mengambil posisi argumen %d tapi %d yang diberikan"
7070
msgid "'%q' argument required"
7171
msgstr "'%q' argumen dibutuhkan"
7272

73-
#: py/emitinlinextensa.c py/emitinlinethumb.c
73+
#: py/emitinlinethumb.c py/emitinlinextensa.c
7474
#, c-format
7575
msgid "'%s' expects a label"
7676
msgstr ""
7777

78-
#: py/emitinlinextensa.c py/emitinlinethumb.c
78+
#: py/emitinlinethumb.c py/emitinlinextensa.c
7979
#, c-format
8080
msgid "'%s' expects a register"
8181
msgstr "'%s' mengharapkan sebuah register"
@@ -95,7 +95,7 @@ msgstr "'%s' mengharapkan sebuah FPU register"
9595
msgid "'%s' expects an address of the form [a, b]"
9696
msgstr "'%s' mengharapkan sebuah alamat dengan bentuk [a, b]"
9797

98-
#: py/emitinlinextensa.c py/emitinlinethumb.c
98+
#: py/emitinlinethumb.c py/emitinlinextensa.c
9999
#, c-format
100100
msgid "'%s' expects an integer"
101101
msgstr "'%s' mengharapkan integer"
@@ -253,9 +253,9 @@ msgstr "Semua channel event yang disinkronisasi sedang digunakan"
253253
msgid "All timers for this pin are in use"
254254
msgstr "Semua timer untuk pin ini sedang digunakan"
255255

256-
#: ports/atmel-samd/common-hal/pulseio/PulseOut.c
257-
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
258256
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
257+
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
258+
#: ports/atmel-samd/common-hal/pulseio/PulseOut.c
259259
#: ports/nrf/common-hal/pulseio/PulseOut.c shared-bindings/pulseio/PWMOut.c
260260
#: shared-module/_pew/PewPew.c
261261
msgid "All timers in use"
@@ -326,7 +326,7 @@ msgstr ""
326326
msgid "Buffer incorrect size. Should be %d bytes."
327327
msgstr ""
328328

329-
#: shared-bindings/busio/I2C.c shared-bindings/bitbangio/I2C.c
329+
#: shared-bindings/bitbangio/I2C.c shared-bindings/busio/I2C.c
330330
msgid "Buffer must be at least length 1"
331331
msgstr ""
332332

@@ -345,6 +345,10 @@ msgstr "buffers harus mempunyai panjang yang sama"
345345
msgid "Bytes must be between 0 and 255."
346346
msgstr ""
347347

348+
#: py/objtype.c
349+
msgid "Call super().__init__() before accessing native object."
350+
msgstr ""
351+
348352
#: shared-bindings/_pixelbuf/PixelBuf.c
349353
#, c-format
350354
msgid "Can not use dotstar with %s"
@@ -366,7 +370,7 @@ msgstr ""
366370
msgid "Can't connect in Peripheral mode"
367371
msgstr ""
368372

369-
#: shared-bindings/pulseio/PulseIn.c shared-bindings/displayio/Bitmap.c
373+
#: shared-bindings/displayio/Bitmap.c shared-bindings/pulseio/PulseIn.c
370374
msgid "Cannot delete values"
371375
msgstr ""
372376

@@ -452,7 +456,7 @@ msgstr "Clock unit sedang digunakan"
452456
msgid "Column entry must be digitalio.DigitalInOut"
453457
msgstr ""
454458

455-
#: shared-bindings/displayio/ParallelBus.c shared-bindings/displayio/FourWire.c
459+
#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/ParallelBus.c
456460
msgid "Command must be an int between 0 and 255"
457461
msgstr ""
458462

@@ -490,8 +494,8 @@ msgstr ""
490494
msgid "Data chunk must follow fmt chunk"
491495
msgstr ""
492496

493-
#: ports/nrf/common-hal/bleio/Peripheral.c
494497
#: ports/nrf/common-hal/bleio/Broadcaster.c
498+
#: ports/nrf/common-hal/bleio/Peripheral.c
495499
#, fuzzy
496500
msgid "Data too large for advertisement packet"
497501
msgstr "Tidak bisa menyesuaikan data ke dalam paket advertisment"
@@ -513,17 +517,17 @@ msgstr ""
513517
msgid "Drive mode not used when direction is input."
514518
msgstr ""
515519

516-
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
517520
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
521+
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
518522
msgid "EXTINT channel already in use"
519523
msgstr "Channel EXTINT sedang digunakan"
520524

521525
#: extmod/modure.c
522526
msgid "Error in regex"
523527
msgstr "Error pada regex"
524528

525-
#: shared-bindings/microcontroller/Pin.c shared-bindings/pulseio/PulseOut.c
526-
#: shared-bindings/neopixel_write/__init__.c
529+
#: shared-bindings/microcontroller/Pin.c
530+
#: shared-bindings/neopixel_write/__init__.c shared-bindings/pulseio/PulseOut.c
527531
#: shared-bindings/terminalio/Terminal.c
528532
msgid "Expected a %q"
529533
msgstr ""
@@ -532,8 +536,8 @@ msgstr ""
532536
msgid "Expected a Characteristic"
533537
msgstr ""
534538

535-
#: shared-bindings/bleio/Descriptor.c shared-bindings/bleio/Service.c
536-
#: shared-bindings/bleio/Characteristic.c
539+
#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Descriptor.c
540+
#: shared-bindings/bleio/Service.c
537541
msgid "Expected a UUID"
538542
msgstr ""
539543

@@ -657,8 +661,8 @@ msgstr "Gagal untuk melepaskan mutex, status: 0x%08lX"
657661
msgid "Failed to start advertising"
658662
msgstr "Gagal untuk memulai advertisement, status: 0x%08lX"
659663

660-
#: ports/nrf/common-hal/bleio/Peripheral.c
661664
#: ports/nrf/common-hal/bleio/Broadcaster.c
665+
#: ports/nrf/common-hal/bleio/Peripheral.c
662666
#, fuzzy, c-format
663667
msgid "Failed to start advertising, err 0x%04x"
664668
msgstr "Gagal untuk memulai advertisement, status: 0x%08lX"
@@ -678,8 +682,8 @@ msgstr "Gagal untuk melakukan scanning, status: 0x%08lX"
678682
msgid "Failed to stop advertising"
679683
msgstr "Gagal untuk memberhentikan advertisement, status: 0x%08lX"
680684

681-
#: ports/nrf/common-hal/bleio/Peripheral.c
682685
#: ports/nrf/common-hal/bleio/Broadcaster.c
686+
#: ports/nrf/common-hal/bleio/Peripheral.c
683687
#, fuzzy, c-format
684688
msgid "Failed to stop advertising, err 0x%04x"
685689
msgstr "Gagal untuk memberhentikan advertisement, status: 0x%08lX"
@@ -720,8 +724,8 @@ msgstr ""
720724
msgid "Frequency captured is above capability. Capture Paused."
721725
msgstr ""
722726

723-
#: shared-bindings/busio/I2C.c shared-bindings/busio/SPI.c
724727
#: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c
728+
#: shared-bindings/busio/I2C.c shared-bindings/busio/SPI.c
725729
msgid "Function requires lock"
726730
msgstr ""
727731

@@ -797,16 +801,16 @@ msgstr ""
797801
msgid "Invalid format chunk size"
798802
msgstr ""
799803

800-
#: shared-bindings/busio/SPI.c shared-bindings/bitbangio/SPI.c
804+
#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c
801805
msgid "Invalid number of bits"
802806
msgstr ""
803807

804-
#: shared-bindings/busio/SPI.c shared-bindings/bitbangio/SPI.c
808+
#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c
805809
msgid "Invalid phase"
806810
msgstr ""
807811

808-
#: ports/atmel-samd/common-hal/touchio/TouchIn.c
809812
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
813+
#: ports/atmel-samd/common-hal/touchio/TouchIn.c
810814
#: shared-bindings/pulseio/PWMOut.c
811815
msgid "Invalid pin"
812816
msgstr "Pin tidak valid"
@@ -827,7 +831,7 @@ msgstr "Pin untuk channel kanan tidak valid"
827831
msgid "Invalid pins"
828832
msgstr "Pin-pin tidak valid"
829833

830-
#: shared-bindings/busio/SPI.c shared-bindings/bitbangio/SPI.c
834+
#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c
831835
msgid "Invalid polarity"
832836
msgstr ""
833837

@@ -891,8 +895,8 @@ msgstr ""
891895
msgid "Microphone startup delay must be in range 0.0 to 1.0"
892896
msgstr ""
893897

894-
#: shared-bindings/displayio/Display.c
895-
msgid "Must be a Group subclass."
898+
#: shared-bindings/displayio/Group.c
899+
msgid "Must be a %q subclass."
896900
msgstr ""
897901

898902
#: ports/atmel-samd/common-hal/analogio/AnalogOut.c
@@ -928,8 +932,8 @@ msgstr "Tidak ada GCLK yang kosong"
928932
msgid "No hardware random available"
929933
msgstr ""
930934

931-
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
932935
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
936+
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
933937
msgid "No hardware support on pin"
934938
msgstr "Tidak ada dukungan hardware untuk pin"
935939

@@ -1085,8 +1089,8 @@ msgstr "Serializer sedang digunakan"
10851089
msgid "Slice and value different lengths."
10861090
msgstr ""
10871091

1088-
#: shared-bindings/pulseio/PulseIn.c shared-bindings/displayio/Bitmap.c
1089-
#: shared-bindings/displayio/TileGrid.c shared-bindings/displayio/Group.c
1092+
#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/Group.c
1093+
#: shared-bindings/displayio/TileGrid.c shared-bindings/pulseio/PulseIn.c
10901094
msgid "Slices not supported"
10911095
msgstr ""
10921096

@@ -1175,7 +1179,7 @@ msgstr "Untuk keluar, silahkan reset board tanpa "
11751179
msgid "Too many channels in sample."
11761180
msgstr "Terlalu banyak channel dalam sampel"
11771181

1178-
#: shared-bindings/displayio/ParallelBus.c shared-bindings/displayio/FourWire.c
1182+
#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/ParallelBus.c
11791183
msgid "Too many display busses"
11801184
msgstr ""
11811185

@@ -1345,8 +1349,8 @@ msgstr ""
13451349
msgid "argument has wrong type"
13461350
msgstr ""
13471351

1348-
#: py/argcheck.c shared-bindings/gamepad/GamePad.c
1349-
#: shared-bindings/_stage/__init__.c shared-bindings/digitalio/DigitalInOut.c
1352+
#: py/argcheck.c shared-bindings/_stage/__init__.c
1353+
#: shared-bindings/digitalio/DigitalInOut.c shared-bindings/gamepad/GamePad.c
13501354
msgid "argument num/types mismatch"
13511355
msgstr "argumen num/types tidak cocok"
13521356

@@ -1416,7 +1420,7 @@ msgstr ""
14161420
msgid "buffer size must match format"
14171421
msgstr "buffers harus mempunyai panjang yang sama"
14181422

1419-
#: shared-bindings/busio/SPI.c shared-bindings/bitbangio/SPI.c
1423+
#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c
14201424
msgid "buffer slices must be of equal length"
14211425
msgstr ""
14221426

@@ -1700,7 +1704,7 @@ msgstr ""
17001704
msgid "dict update sequence has wrong length"
17011705
msgstr ""
17021706

1703-
#: py/objfloat.c py/runtime.c py/modmath.c py/objint_longlong.c py/objint_mpz.c
1707+
#: py/modmath.c py/objfloat.c py/objint_longlong.c py/objint_mpz.c py/runtime.c
17041708
#: shared-bindings/math/__init__.c
17051709
msgid "division by zero"
17061710
msgstr ""
@@ -1709,7 +1713,7 @@ msgstr ""
17091713
msgid "empty"
17101714
msgstr ""
17111715

1712-
#: extmod/modutimeq.c extmod/moduheapq.c
1716+
#: extmod/moduheapq.c extmod/modutimeq.c
17131717
msgid "empty heap"
17141718
msgstr "heap kosong"
17151719

@@ -1770,7 +1774,7 @@ msgstr "argumen keyword ekstra telah diberikan"
17701774
msgid "extra positional arguments given"
17711775
msgstr "argumen posisi ekstra telah diberikan"
17721776

1773-
#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/audioio/WaveFile.c
1777+
#: shared-bindings/audioio/WaveFile.c shared-bindings/displayio/OnDiskBitmap.c
17741778
msgid "file must be a file opened in byte mode"
17751779
msgstr ""
17761780

@@ -1943,7 +1947,7 @@ msgstr "micropython decorator tidak valid"
19431947
msgid "invalid step"
19441948
msgstr ""
19451949

1946-
#: py/parse.c py/compile.c
1950+
#: py/compile.c py/parse.c
19471951
msgid "invalid syntax"
19481952
msgstr "syntax tidak valid"
19491953

@@ -1980,7 +1984,7 @@ msgstr "argumen keyword belum diimplementasi - gunakan args normal"
19801984
msgid "keywords must be strings"
19811985
msgstr "keyword harus berupa string"
19821986

1983-
#: py/emitinlinextensa.c py/emitinlinethumb.c
1987+
#: py/emitinlinethumb.c py/emitinlinextensa.c
19841988
msgid "label '%q' not defined"
19851989
msgstr ""
19861990

@@ -2087,11 +2091,11 @@ msgstr ""
20872091
msgid "need more than %d values to unpack"
20882092
msgstr ""
20892093

2090-
#: py/runtime.c py/objint_longlong.c py/objint_mpz.c
2094+
#: py/objint_longlong.c py/objint_mpz.c py/runtime.c
20912095
msgid "negative power with no float support"
20922096
msgstr ""
20932097

2094-
#: py/runtime.c py/objint_mpz.c
2098+
#: py/objint_mpz.c py/runtime.c
20952099
msgid "negative shift count"
20962100
msgstr ""
20972101

@@ -2198,7 +2202,7 @@ msgstr "panjang data string memiliki keganjilan (odd-length)"
21982202
msgid "offset out of bounds"
21992203
msgstr "modul tidak ditemukan"
22002204

2201-
#: py/objstr.c py/objarray.c py/objstrunicode.c py/objtuple.c
2205+
#: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
22022206
#: shared-bindings/nvm/ByteArray.c
22032207
msgid "only slices with step=1 (aka None) are supported"
22042208
msgstr ""
@@ -2348,7 +2352,7 @@ msgstr ""
23482352
msgid "slice step cannot be zero"
23492353
msgstr ""
23502354

2351-
#: py/sequence.c py/objint.c
2355+
#: py/objint.c py/sequence.c
23522356
msgid "small int overflow"
23532357
msgstr ""
23542358

0 commit comments

Comments
 (0)