Skip to content

Commit 3c93b4e

Browse files
tobozotobozo
authored
Merge pull request #15 from tobozo/1.3.0
i18n basics + teensy core support
2 parents 8c2f3d8 + a9b0698 commit 3c93b4e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+25856
-85
lines changed

‎License

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
ESP32-yaml
1+
YAMLDuino
22
-------------------------------------------------------------------------------
3-
Project Page: https://github.com/tobozo/esp32-yaml
3+
Project Page: https://github.com/tobozo/YAMLDuino
44
Copyright 2022 tobozo http://github.com/tobozo
55

66
Permission is hereby granted, free of charge, to any person
77
obtaining a copy of this software and associated documentation
8-
files ("ESP32-yaml"), to deal in the Software without
8+
files ("YAMLDuino"), to deal in the Software without
99
restriction, including without limitation the rights to use,
1010
copy, modify, merge, publish, distribute, sublicense, and/or
1111
sell copies of the Software, and to permit persons to whom the
@@ -26,7 +26,7 @@ OTHER DEALINGS IN THE SOFTWARE.
2626

2727

2828
-------------------------------------------------------------------------------
29-
ESP32-yaml is bundled with libyaml and cJSON
29+
YAMLDuino is bundled with libyaml and cJSON
3030
-------------------------------------------------------------------------------
3131

3232

‎ReadMe.md

+55-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ DeserializationError deserializeYml( JsonDocument &dest_doc, const char *src_yam
150150
151151
----------------------------
152152
153-
## cJSON bindinds
153+
## cJSON bindings
154154
155155
cJSON support is implicitely enabled on most platforms, and will use the bundled cJSON version unless ESP32 platform is detected.
156156
ESP32 will use the built-in cJSON version from esp-idf instead of the YAMLDuino bundled version.
@@ -252,6 +252,60 @@ YAML::setYAMLIndent( 3 );
252252
----------------------------
253253
254254
255+
## I18N and L10N
256+
257+
Note: Support is disabled with WIO Terminal (needs a proper fs::FS implementation).
258+
259+
* Load the module with `#include <i18n/i18n.hpp>`.
260+
* Assign a filesystem with `i18n.setFS()`.
261+
* Load a locale with `i18n.setLocale()`.
262+
* Use `i18n.gettext()` to access localized strings.
263+
264+
265+
```cpp
266+
267+
#include <LittleFS.h>
268+
#include <ArduinoJson.h>
269+
#define YAML_DISABLE_CJSON // not needed here
270+
#include <YAMLDuino.h>
271+
#include <i18n/i18n.hpp>
272+
273+
// Sample example `/lang/en-GB.yml` stored in LittleFS:
274+
//
275+
// en-GB:
276+
// hello: world
277+
// blah:
278+
// my_array:
279+
// - first
280+
// - second
281+
// - third
282+
283+
284+
void setup()
285+
{
286+
Serial.begin(115200);
287+
LittleFS.begin();
288+
289+
i18n.setFS( &LittleFS ); // assign LittleFS
290+
i18n.setLocale("en-GB"); // will load "/lang/en-GB.yml" language file
291+
292+
Serial.println( i18n.gettext("hello" ) ); // prints "world"
293+
Serial.println( i18n.gettext("blah:my_array:2" ) ); // prints "third"
294+
}
295+
296+
297+
void loop()
298+
{
299+
300+
delay(1000);
301+
}
302+
```
303+
304+
305+
----------------------------
306+
307+
308+
255309
## Debug
256310

257311

‎examples/i18n/data/lang/af.yml

+213
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,213 @@
1+
---
2+
af:
3+
activerecord:
4+
errors:
5+
messages:
6+
record_invalid: 'Validering het misluk: %{errors}'
7+
restrict_dependent_destroy:
8+
has_one: Kan rekord nie skrap nie omdat 'n afhanklike %{record} bestaan
9+
has_many: Kan rekord nie skrap nie omdat afhanklike %{record} bestaan
10+
date:
11+
abbr_day_names:
12+
- Son
13+
- Maan
14+
- Dins
15+
- Woe
16+
- Don
17+
- Vry
18+
- Sat
19+
abbr_month_names:
20+
-
21+
- Jan
22+
- Feb
23+
- Mar
24+
- Apr
25+
- Mei
26+
- Jun
27+
- Jul
28+
- Aug
29+
- Sep
30+
- Okt
31+
- Nov
32+
- Des
33+
day_names:
34+
- Sondag
35+
- Maandag
36+
- Dinsdag
37+
- Woensdag
38+
- Donderdag
39+
- Vrydag
40+
- Saterdag
41+
formats:
42+
default: "%Y-%m-%d"
43+
long: "%d %B %Y"
44+
short: "%d %b"
45+
month_names:
46+
-
47+
- Januarie
48+
- Februarie
49+
- Maart
50+
- April
51+
- Mai
52+
- Junie
53+
- Julie
54+
- Augustus
55+
- September
56+
- Oktober
57+
- November
58+
- Desember
59+
order:
60+
- :year
61+
- :month
62+
- :day
63+
datetime:
64+
distance_in_words:
65+
about_x_hours:
66+
one: ongeveer %{count} uur
67+
other: ongeveer %{count} ure
68+
about_x_months:
69+
one: ongeveer %{count} maand
70+
other: ongeveer %{count} maande
71+
about_x_years:
72+
one: ongeveer %{count} jaar
73+
other: ongeveer %{count} jaar
74+
almost_x_years:
75+
one: sowat %{count} jaar
76+
other: sowat %{count} jaar
77+
half_a_minute: halfminuut
78+
less_than_x_seconds:
79+
one: minder as %{count} sekonde
80+
other: minder as %{count} sekondes
81+
less_than_x_minutes:
82+
one: minder as %{count} minuut
83+
other: minder as %{count} minute
84+
over_x_years:
85+
one: meer as %{count} jaar
86+
other: meer as %{count} jaar
87+
x_seconds:
88+
one: "%{count} sekonde"
89+
other: "%{count} sekondes"
90+
x_minutes:
91+
one: "%{count} minuut"
92+
other: "%{count} minute"
93+
x_days:
94+
one: "%{count} dag"
95+
other: "%{count} days"
96+
x_months:
97+
one: "%{count} maand"
98+
other: "%{count} maande"
99+
x_years:
100+
one: "%{count} jaar"
101+
other: "%{count} jare"
102+
prompts:
103+
second: Sekondes
104+
minute: Minuut
105+
hour: Uur
106+
day: Dag
107+
month: Maand
108+
year: Jaar
109+
errors:
110+
format: "%{attribute} %{message}"
111+
messages:
112+
accepted: moet aanvaar word
113+
blank: mag nie leeg wees nie
114+
confirmation: pas nie by bevestiging nie
115+
empty: mag nie leeg wees nie
116+
equal_to: moet gelyk wees aan %{count}
117+
even: moet ewe wees
118+
exclusion: is bespreek
119+
greater_than: moet meer wees as %{count}
120+
greater_than_or_equal_to: moet meer of gelykstaande wees aan %{count}
121+
inclusion: is nie by die lys ingesluit nie
122+
invalid: is ongeldig
123+
less_than: moet minder wees as %{count}
124+
less_than_or_equal_to: moet minder of gelykstaande wees aan %{count}
125+
model_invalid: 'Validering het misluk: %{errors}'
126+
not_a_number: is nie 'n getal nie
127+
not_an_integer: moet 'n heelgetal wees
128+
odd: moet onewe wees
129+
other_than: moet anders wees as %{count}
130+
present: moet leeg wees
131+
required: moet bestaan
132+
taken: is reeds geneem
133+
too_long:
134+
one: is te lank (maksimum is %{count} karakter)
135+
other: is te lank (maksimum is %{count} karakters)
136+
too_short:
137+
one: is te kort (minimum is %{count} karakter)
138+
other: is te kort (minimum is %{count} karakters)
139+
wrong_length:
140+
one: is die verkeerde lengte (moet %{count} karakter wees)
141+
other: is die verkeerde lengte (moet %{count} karakters wees)
142+
template:
143+
body: 'There were problems with the following fields:'
144+
header:
145+
one: "%{count} fout het verhoed dat hierdie %{model} gestoor kon word"
146+
other: "%{count} foute het verhoed dat hierdie %{model} gestoor kon word"
147+
helpers:
148+
select:
149+
prompt: Kies asseblief
150+
submit:
151+
create: Skep %{model}
152+
submit: Stoor %{model}
153+
update: Dateer %{model} op
154+
number:
155+
currency:
156+
format:
157+
delimiter: ","
158+
format: "%u%n"
159+
precision: 2
160+
separator: "."
161+
significant: false
162+
strip_insignificant_zeros: false
163+
unit: R
164+
format:
165+
delimiter: ","
166+
precision: 3
167+
separator: "."
168+
significant: false
169+
strip_insignificant_zeros: false
170+
human:
171+
decimal_units:
172+
format: "%n %u"
173+
units:
174+
billion: miljard
175+
million: miljoen
176+
quadrillion: biljard
177+
thousand: duisend
178+
trillion: biljoen
179+
unit: ''
180+
format:
181+
delimiter: ''
182+
precision: 3
183+
significant: true
184+
strip_insignificant_zeros: true
185+
storage_units:
186+
format: "%n %u"
187+
units:
188+
byte:
189+
one: Greep
190+
other: Grepe
191+
gb: GG
192+
kb: kG
193+
mb: MG
194+
tb: TG
195+
percentage:
196+
format:
197+
delimiter: ''
198+
format: "%n%"
199+
precision:
200+
format:
201+
delimiter: ''
202+
support:
203+
array:
204+
last_word_connector: ", en "
205+
two_words_connector: " en "
206+
words_connector: ", "
207+
time:
208+
am: vm
209+
formats:
210+
default: "%a, %d %b %Y %H:%M:%S %z"
211+
long: "%d %B %Y %H:%M"
212+
short: "%d %b %H:%M"
213+
pm: nm

0 commit comments

Comments
 (0)