Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update messages and po files #61

Open
wants to merge 23 commits into
base: mk3-mmu
Choose a base branch
from
Open

Update messages and po files #61

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
929d9b2
Add double down arrow to be processed correctly
3d-gussner Aug 8, 2022
d08b8b7
Remove PAT9125 stats as these aren't different to IR stats
3d-gussner Aug 9, 2022
8bdb5ff
Remove similar message IR messages
3d-gussner Aug 9, 2022
213bcff
Update config.h translation documentation and move language to group2
3d-gussner Aug 9, 2022
628aef9
lang: Correctly include last element in map file
wavexx Aug 9, 2022
ede35e8
lang: Add inline documentation for the various language macros
wavexx Aug 9, 2022
6b0993f
lang: Add support for raw catalog references with _R
wavexx Aug 9, 2022
e5eaef8
MMU2/lang: Update translatable strings to match our extraction macros
wavexx Aug 9, 2022
49abc39
lang: Fix usage of new non-translated strings
wavexx Aug 9, 2022
209a2ed
lang: Do not check/build obsolete translation entries
wavexx Aug 9, 2022
efda8fe
Use origin message on serial
3d-gussner Aug 10, 2022
7ae837d
Add c= to button messages
3d-gussner Aug 10, 2022
435c100
Prepare progress messages for translation
3d-gussner Aug 10, 2022
8a174d8
Update button menu documentation as there are 1/2/3 options
3d-gussner Aug 10, 2022
af27027
Add sorting to messages.cpp/.h
3d-gussner Aug 10, 2022
e7eb2bf
update mmu2 messages c= r= values
3d-gussner Aug 10, 2022
92fed65
Deduplication
3d-gussner Aug 11, 2022
dca036c
Update POT and PO files
3d-gussner Aug 11, 2022
26a38f1
ByeBye Bondtech
3d-gussner Aug 11, 2022
d435b93
lang: Improve invalid row/column count checks
wavexx Aug 11, 2022
3640295
Remove MSG_M117_V2_CALIBRATION
wavexx Aug 11, 2022
718b687
Add backup for po/Firmware.pot
3d-gussner Aug 12, 2022
c94a4c9
Merge branch 'mk3-mmu' into mk3-mmu-messages
DRracer Aug 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Firmware/language.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@

#define _N(s) (__extension__({static const char __c[] PROGMEM_N1 = s; &__c[0];}))
#define _n(s) _N(s) // declare and return untranslated string
#define _R(s) (s) // return reference to translatable string (for warning suppression)
3d-gussner marked this conversation as resolved.
Show resolved Hide resolved

/** @brief lang_table_header_t structure - (size= 16byte) */
typedef struct
Expand Down
4 changes: 2 additions & 2 deletions lang/lang-extract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ def extract_refs(path, catalog):

# match message catalog references to add backrefs
RE_CAT = r'''
(?<!(?:/[/*]|^\s*\#) [^\n]*) # not on a comment or preprocessor
\b (?:_[TO]) \s* \( \s* (\w+) \s* \) # $1 catalog name
(?<!(?:/[/*]|^\s*\#) [^\n]*) # not on a comment or preprocessor
\b (?:_[TOR]) \s* \( \s* (\w+) \s* \) # $1 catalog name
'''

for m in regex.finditer(RE_CAT, source, regex.M|regex.X):
Expand Down