Skip to content

Commit cf3b402

Browse files
dhalbertdhalbert
committed
add pca10059 properly to build_adafruit_bins.sh; modernize that script; update translations (again)
1 parent 56b7f3b commit cf3b402

File tree

7 files changed

+30
-33
lines changed

7 files changed

+30
-33
lines changed

‎locale/circuitpython.pot

Lines changed: 2 additions & 2 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: 2018-09-18 15:38-0400\n"
11+
"POT-Creation-Date: 2018-09-18 22:20-0400\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -689,7 +689,7 @@ msgstr ""
689689
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
690690
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71
691691
#: ports/nrf/common-hal/busio/UART.c:76 ports/nrf/common-hal/busio/UART.c:81
692-
#: ports/nrf/common-hal/busio/UART.c:90
692+
#: ports/nrf/common-hal/busio/UART.c:86 ports/nrf/common-hal/busio/UART.c:90
693693
msgid "busio.UART not yet implemented"
694694
msgstr ""
695695

‎locale/de_DE.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2018-09-18 15:38-0400\n"
10+
"POT-Creation-Date: 2018-09-18 22:20-0400\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: Sebastian Plamauer\n"
1313
"Language-Team: \n"
@@ -698,7 +698,7 @@ msgstr ""
698698
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
699699
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71
700700
#: ports/nrf/common-hal/busio/UART.c:76 ports/nrf/common-hal/busio/UART.c:81
701-
#: ports/nrf/common-hal/busio/UART.c:90
701+
#: ports/nrf/common-hal/busio/UART.c:86 ports/nrf/common-hal/busio/UART.c:90
702702
msgid "busio.UART not yet implemented"
703703
msgstr ""
704704

‎locale/en_US.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2018-09-18 15:38-0400\n"
10+
"POT-Creation-Date: 2018-09-18 22:20-0400\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -689,7 +689,7 @@ msgstr ""
689689
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
690690
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71
691691
#: ports/nrf/common-hal/busio/UART.c:76 ports/nrf/common-hal/busio/UART.c:81
692-
#: ports/nrf/common-hal/busio/UART.c:90
692+
#: ports/nrf/common-hal/busio/UART.c:86 ports/nrf/common-hal/busio/UART.c:90
693693
msgid "busio.UART not yet implemented"
694694
msgstr ""
695695

‎locale/es.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2018-09-18 15:38-0400\n"
10+
"POT-Creation-Date: 2018-09-18 22:20-0400\n"
1111
"PO-Revision-Date: 2018-08-24 22:56-0500\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -707,7 +707,7 @@ msgstr ""
707707
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
708708
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71
709709
#: ports/nrf/common-hal/busio/UART.c:76 ports/nrf/common-hal/busio/UART.c:81
710-
#: ports/nrf/common-hal/busio/UART.c:90
710+
#: ports/nrf/common-hal/busio/UART.c:86 ports/nrf/common-hal/busio/UART.c:90
711711
msgid "busio.UART not yet implemented"
712712
msgstr ""
713713

‎locale/fil.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2018-09-18 15:38-0400\n"
10+
"POT-Creation-Date: 2018-09-18 22:20-0400\n"
1111
"PO-Revision-Date: 2018-08-30 23:04-0700\n"
1212
"Last-Translator: Timothy <me@timothygarcia.ca>\n"
1313
"Language-Team: fil\n"
@@ -704,7 +704,7 @@ msgstr "Hindi supportado ang AnalogOut"
704704
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
705705
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71
706706
#: ports/nrf/common-hal/busio/UART.c:76 ports/nrf/common-hal/busio/UART.c:81
707-
#: ports/nrf/common-hal/busio/UART.c:90
707+
#: ports/nrf/common-hal/busio/UART.c:86 ports/nrf/common-hal/busio/UART.c:90
708708
msgid "busio.UART not yet implemented"
709709
msgstr "hindi pa implemented ang busio.UART"
710710

‎locale/fr.po

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: 0.1\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2018-09-18 15:38-0400\n"
10+
"POT-Creation-Date: 2018-09-18 22:20-0400\n"
1111
"PO-Revision-Date: 2018-08-14 11:01+0200\n"
1212
"Last-Translator: Pierrick Couturier <arofarn@arofarn.info>\n"
1313
"Language-Team: fr\n"
@@ -700,7 +700,7 @@ msgstr "AnalogOut non supporté"
700700
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
701701
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71
702702
#: ports/nrf/common-hal/busio/UART.c:76 ports/nrf/common-hal/busio/UART.c:81
703-
#: ports/nrf/common-hal/busio/UART.c:90
703+
#: ports/nrf/common-hal/busio/UART.c:86 ports/nrf/common-hal/busio/UART.c:90
704704
msgid "busio.UART not yet implemented"
705705
msgstr "busio.UART pas encore implémenté"
706706

@@ -2386,10 +2386,10 @@ msgstr "'S' et 'O' ne sont pas des types de format supportés"
23862386
msgid "too many arguments provided with the given format"
23872387
msgstr "trop d'arguments fournis avec ce format"
23882388

2389-
#, fuzzy
2390-
#~ msgid "palette must be displayio.Palette"
2391-
#~ msgstr "la palette doit être longue de 32 octets"
2392-
23932389
#, fuzzy
23942390
#~ msgid "value_size must be power of two"
23952391
#~ msgstr "'len' doit être un multiple de 4"
2392+
2393+
#, fuzzy
2394+
#~ msgid "palette must be displayio.Palette"
2395+
#~ msgstr "la palette doit être longue de 32 octets"

‎tools/build_adafruit_bins.sh

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#!/usr/bin/env bash
2+
13
rm -rf ports/atmel-samd/build*
24
rm -rf ports/esp8266/build*
35
rm -rf ports/nrf/build*
@@ -34,25 +36,25 @@ trinket_m0 \
3436
ROSIE_SETUPS="rosie-ci"
3537

3638
PARALLEL="-j 5"
37-
if [ "$TRAVIS" == "true" ]; then
39+
if [[ "$TRAVIS" == "true" ]]; then
3840
PARALLEL="-j 2"
3941
fi
4042

41-
if [ -z "$TRAVIS_BOARD" ]; then
43+
if [[ -z "$TRAVIS_BOARD" ]]; then
4244
boards=$HW_BOARDS
4345
else
4446
boards=$TRAVIS_BOARD
4547
fi
4648

4749
version=`git describe --tags --exact-match`
48-
if [ $? -ne 0 ]; then
50+
if [[ $? -ne 0 ]]; then
4951
version=`date +%Y%m%d`-`git rev-parse --short HEAD`
5052
fi
5153

5254

53-
if [ "$TRAVIS" == "true" ]; then
55+
if [[ "$TRAVIS" == "true" ]]; then
5456
sha=$TRAVIS_COMMIT
55-
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
57+
if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then
5658
version=`date +%Y%m%d`-`echo $TRAVIS_PULL_REQUEST_SHA | cut -c1-7`
5759
sha=$TRAVIS_PULL_REQUEST_SHA
5860
fi
@@ -64,23 +66,18 @@ for board in $boards; do
6466
for language_file in $(ls locale/*.po); do
6567
language=$(basename -s .po $language_file)
6668
echo "Building $board for $language"
67-
if [ $board == "feather_huzzah" ]; then
68-
make $PARALLEL -C ports/esp8266 TRANSLATION=$language BOARD=feather_huzzah
69+
if [[ $board == "feather_huzzah" ]]; then
70+
make $PARALLEL -C ports/esp8266 TRANSLATION=$language BOARD=$board
6971
(( exit_status = exit_status || $? ))
7072
temp_filename=ports/esp8266/build/firmware-combined.bin
7173
extension=bin
72-
elif [ $board == "feather_nrf52832" ]; then
73-
make $PARALLEL -C ports/nrf TRANSLATION=$language BOARD=feather_nrf52832
74+
elif [[ $board == "feather_nrf52832" ]]; then
75+
make $PARALLEL -C ports/nrf TRANSLATION=$language BOARD=$board
7476
(( exit_status = exit_status || $? ))
7577
temp_filename=ports/nrf/build-$board-s132/firmware.bin
7678
extension=bin
77-
elif [ $board == "feather_nrf52840_express" ]; then
78-
make $PARALLEL -C ports/nrf TRANSLATION=$language BOARD=feather_nrf52840_express SD=s140
79-
(( exit_status = exit_status || $? ))
80-
temp_filename=ports/nrf/build-$board-s140/firmware.uf2
81-
extension=uf2
82-
elif [ $board == "pca10056" ]; then
83-
make $PARALLEL -C ports/nrf TRANSLATION=$language BOARD=pca10056 SD=s140
79+
elif [[ $board == "feather_nrf52840_express" || $board == "pca10056" || $board == "pca10059" ]]; then
80+
make $PARALLEL -C ports/nrf TRANSLATION=$language BOARD=$board SD=s140
8481
(( exit_status = exit_status || $? ))
8582
temp_filename=ports/nrf/build-$board-s140/firmware.uf2
8683
extension=uf2
@@ -96,7 +93,7 @@ for board in $boards; do
9693
cp $temp_filename $final_filename
9794
(( exit_status = exit_status || $? ))
9895
# Only upload to Rosie if its a pull request.
99-
if [ "$TRAVIS" == "true" ]; then
96+
if [[ "$TRAVIS" == "true" ]]; then
10097
for rosie in $ROSIE_SETUPS; do
10198
echo "Uploading to https://$rosie.ngrok.io/upload/$sha"
10299
curl -F "file=@$final_filename" https://$rosie.ngrok.io/upload/$sha

0 commit comments

Comments
 (0)