Skip to content
Snippets Groups Projects

macos: expand set of string handling macros

Merged Lyndon Brown requested to merge jnqnfe/vlc:macos_tr into master
All threads resolved!

As requested in the !1172 (merged) discussion, this introduces macros similar to those used in the Qt plugin (introduced in 6cd08480), which are ignored by the mechanism that scans for strings to be translated.

Additionally, in fixing this I happened to:

  • Remove a duplicate null check in the macros.
  • Fix a few cases of double translation lookups.
  • Fix the few remaining cases not making use of the module_Get(Short|Long)Name() helpers.
Edited by Lyndon Brown

Merge request reports

Merge request pipeline #184662 passed

Merge request pipeline passed for e791b513

Approval is optional

Merged by Hugo Beauzée-LuyssenHugo Beauzée-Luyssen 3 years ago (Jan 28, 2022 5:37pm UTC)

Merge details

  • Changes merged into master with e791b513.
  • Deleted the source branch.

Pipeline #184672 passed

Pipeline passed for e791b513 on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Marvin Scholz
  • Marvin Scholz
  • Marvin Scholz
  • Thanks for cleaning this up, other than the remarks I did inline, this looks good overall.

  • Lyndon Brown added 7 commits

    added 7 commits

    • 9b062357 - macos: add a separate alternative macro for non-translation marker use
    • bf9f9ed5 - macos: replace all use of `_NS()` on defines and variables
    • 79bfe9a4 - macos: fix duplicate translation of cat/subcat labels
    • 4a411f34 - macos: fix unwanted translation lookup of option names
    • 3c0dd0c4 - macos: use `module_GetShortName()` helper
    • 7962e068 - qt: use `module_GetShortName()` helper
    • ac39c380 - rtp: use `module_GetLongName()` helper

    Compare with previous version

  • David
  • Lyndon Brown added 7 commits

    added 7 commits

    • 928d439c - macos: add a separate alternative macro for non-translation marker use
    • 7e669ff9 - macos: replace all use of `_NS()` on defines and variables
    • e3eea940 - macos: fix duplicate translation of cat/subcat labels
    • eb4b24dc - macos: fix unwanted translation lookup of option names
    • fdd1d4e9 - macos: use `module_GetShortName()` helper
    • 2d64a913 - qt: use `module_GetShortName()` helper
    • ba2b7777 - rtp: use `module_GetLongName()` helper

    Compare with previous version

  • Lyndon Brown added 34 commits

    added 34 commits

    • eb4b24dc...f45fd76f - 30 commits from branch videolan:master
    • 4d07d6a7 - macos: add a separate alternative macro for non-translation marker use
    • 27abc136 - macos: replace all use of `_NS()` on defines and variables
    • 1711c7c4 - macos: fix duplicate translation of cat/subcat labels
    • 04442524 - macos: fix unwanted translation lookup of option names

    Compare with previous version

  • Lyndon Brown resolved all threads

    resolved all threads

  • Author Contributor

    Ping. Just in need of an upvote from someone.

  • MR Acceptance result

    :tada: This MergeRequest has been Accepted! Congratulations.

    MR acceptance checks details:

    • :white_check_mark: MR should be considered mergeable by Gitlab
    • :white_check_mark: Last pipeline should be successful
    • :white_check_mark: MergeRequest should have at least one external review and/or vote
    • :white_check_mark: All threads should be resolved, have votes and score > 0
    • :white_check_mark: MergeRequest should have no activity (threads/votes) for (72h/72h)

    This message was automatically generated by homer-bot.

  • added 125 commits

    • 04442524...3b46bf98 - 121 commits from branch videolan:master
    • 8038904e - macos: add a separate alternative macro for non-translation marker use
    • a785740a - macos: replace all use of `_NS()` on defines and variables
    • ce1b46c3 - macos: fix duplicate translation of cat/subcat labels
    • e791b513 - macos: fix unwanted translation lookup of option names

    Compare with previous version

  • Jean-Baptiste Kempf changed milestone to %4.0

    changed milestone to %4.0

  • Please register or sign in to reply
    Loading