[vlc-devel] [PATCH 3/5] macosx: remove _ANS macro

Marvin Scholz epirat07 at gmail.com
Wed Dec 2 13:59:48 CET 2020


_PNS is a better and "standard" way to handle these cases
---
 modules/gui/macosx/extensions/NSString+Helpers.h | 5 -----
 po/Makevars                                      | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/modules/gui/macosx/extensions/NSString+Helpers.h b/modules/gui/macosx/extensions/NSString+Helpers.h
index 79416d14116..807aa197be1 100644
--- a/modules/gui/macosx/extensions/NSString+Helpers.h
+++ b/modules/gui/macosx/extensions/NSString+Helpers.h
@@ -40,11 +40,6 @@
  */
 #define _PNS(c, s) (toNSStr(vlc_pgettext(c, s)))
 
-/* Get an alternate version of the string.
- * This string is stored as '1:string' but when displayed it only displays
- * the translated string. the translation should be '1:translatedstring' though */
-#define _ANS(s) [((s) ? toNSStr(vlc_gettext(s)) : @"") substringFromIndex:2]
-
 extern NSString *const kVLCMediaAudioCD;
 extern NSString *const kVLCMediaDVD;
 extern NSString *const kVLCMediaVCD;
diff --git a/po/Makevars b/po/Makevars
index 3883c0349e5..0b806b46d14 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -10,7 +10,7 @@ subdir = po
 top_builddir = ..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --directory=.. --keyword=_ --keyword=N_ --keyword=_NS --keyword=_ANS --keyword=qtr --keyword=Q_ --language=C++ --keyword=vlc_ngettext:1,2 --keyword=vlc_pgettext:1c,2 --keyword=_PNS:1c,2 --add-comments=xgettext: --from-code=UTF-8
+XGETTEXT_OPTIONS = --directory=.. --keyword=_ --keyword=N_ --keyword=_NS --keyword=qtr --keyword=Q_ --language=C++ --keyword=vlc_ngettext:1,2 --keyword=vlc_pgettext:1c,2 --keyword=_PNS:1c,2 --add-comments=xgettext: --from-code=UTF-8
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
-- 
2.24.3 (Apple Git-128)



More information about the vlc-devel mailing list