From 7a8025255607d7e0f00abe899464b0e2133a6463 Mon Sep 17 00:00:00 2001
From: Yuri D'Elia <wavexx@thregr.org>
Date: Tue, 9 Aug 2022 17:57:47 +0200
Subject: [PATCH] lang: Add support for raw catalog references with _R

_R marks a raw catalog entry as Referenced (= used) for cases where the
catalog pointers are handled at a lower level.
---
 Firmware/language.h  | 1 +
 lang/lang-extract.py | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Firmware/language.h b/Firmware/language.h
index 3e381fa3a..b0d69e38b 100644
--- a/Firmware/language.h
+++ b/Firmware/language.h
@@ -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)
 
 /** @brief lang_table_header_t structure - (size= 16byte) */
 typedef struct
diff --git a/lang/lang-extract.py b/lang/lang-extract.py
index 5dce1f121..f0ba84356 100755
--- a/lang/lang-extract.py
+++ b/lang/lang-extract.py
@@ -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):