feat(nicknames): finalise NSRT precedence popup

- Localise all popup strings (L[...] + enUS registration); addon names are passed as format args so translators never touch them

- Add a Name precedence dropdown to the Nicknames options page (only shown when NSRT is installed), making good on the popup's 'change it later' promise

- Only prompt when the user actually has DF nicknames to show (entries, received, or a broadcast nick) - without this every NSRT user would get the popup with nothing to choose between

- CHANGELOG entry

Author: Maelareth

CHANGELOG.md

@@ -40,6 +40,7 @@
 * Moved **Pixel-Perfect Scaling** to **General → Settings**, since it applies globally to both party and raid. (by Krathe)
 * (Aura Designer) New icon and square indicators now default their **border inset to 0**, flush with the icon edge, matching the other indicator types. (by Krathe)
 * (Auto Layouts) Saved layouts are tidied of leftover built-in text overrides after the Text Designer migration, so the override list no longer lists dead entries. (by Krathe)
+* (Nicknames) **Northern Sky Raid Tools compatibility** — when NSRT is also set to put nicknames on DandersFrames frames, a one-time prompt lets you choose which addon decides the names shown on your frames (changeable later under **General → Nicknames → Name precedence**), so the two no longer silently fight. (by Maelareth)
 
 ### Bug Fixes
 

Features/Nicknames.lua

@@ -1042,8 +1042,7 @@ end
 -- so the two would fight. We detect that, prompt the user once which should
 -- win, and store the choice (framePrecedence) which DF:GetFrameName honours.
 -- Entirely DF-side: we never modify NSRT, only READ its toggle.
--- NOTE: strings here are hard-coded for the prototype — localise (L[...] +
--- enUS) before merge.
+-- The same choice can be changed later in the Nicknames options page.
 -- ============================================================
 
 -- True if NSRT is loaded AND configured to manage names on DandersFrames frames.
@@ -1086,6 +1085,7 @@ end
 function NK:ShowConflictPopup()
     if NK._conflictPopup then NK._conflictPopup:Show(); return end
 
+    local L = DF.L
     local theme = (DF.GUI and DF.GUI.GetThemeColor and DF.GUI.GetThemeColor())
         or { r = 0.9, g = 0.55, b = 0.15 }
 
@@ -1106,7 +1106,7 @@ function NK:ShowConflictPopup()
 
     local title = popup:CreateFontString(nil, "OVERLAY", "DFFontNormalLarge")
     title:SetPoint("TOP", 0, -16)
-    title:SetText("Addon nicknames conflict")
+    title:SetText(L["Addon nicknames conflict"])
     title:SetTextColor(1, 0.3, 0.3)
 
     local warnTex = "Interface\\AddOns\\DandersFrames\\Media\\Icons\\warning"
@@ -1118,12 +1118,13 @@ function NK:ShowConflictPopup()
     local msg = popup:CreateFontString(nil, "OVERLAY", "DFFontHighlight")
     msg:SetPoint("TOP", title, "BOTTOM", 0, -16)
     msg:SetPoint("LEFT", 28, 0); msg:SetPoint("RIGHT", -28, 0); msg:SetJustifyH("CENTER")
-    msg:SetText("Both |cffe68c26DandersFrames|r and |cff6fb1e0Northern Sky Raid Tools|r are set to show nicknames on your frames.\n\nWhich one should decide the names shown here?")
+    msg:SetText(L["Both %s and %s are set to show nicknames on your frames.\n\nWhich one should decide the names shown here?"]
+        :format("|cffe68c26DandersFrames|r", "|cff6fb1e0Northern Sky Raid Tools|r"))
 
     local sub = popup:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
     sub:SetPoint("TOP", msg, "BOTTOM", 0, -12)
     sub:SetPoint("LEFT", 28, 0); sub:SetPoint("RIGHT", -28, 0); sub:SetJustifyH("CENTER")
-    sub:SetText("This only changes who controls names on DandersFrames frames - you can change it later in Nicknames settings.")
+    sub:SetText(L["This only changes who controls names on DandersFrames frames - you can change it later in Nicknames settings."])
     sub:SetTextColor(0.7, 0.7, 0.7)
 
     local function choose(pref)
@@ -1155,9 +1156,9 @@ function NK:ShowConflictPopup()
         return b
     end
 
-    local dfBtn = makeButton("Use DandersFrames nicknames", true, function() choose("self") end)
+    local dfBtn = makeButton(L["Use %s nicknames"]:format("DandersFrames"), true, function() choose("self") end)
     dfBtn:SetPoint("BOTTOM", -118, 16)
-    local nsBtn = makeButton("Use Northern Sky Raid Tools nicknames", false, function() choose("nsrt") end)
+    local nsBtn = makeButton(L["Use %s nicknames"]:format("Northern Sky Raid Tools"), false, function() choose("nsrt") end)
     nsBtn:SetPoint("BOTTOM", 118, 16)
 
     NK._conflictPopup = popup
@@ -1169,6 +1170,14 @@ function NK:CheckConflictPrompt()
     local data = NK:GetDB()
     if not data or not data.enabled then return end
     if data.framePrecedence ~= nil then return end   -- already decided
+    -- Only prompt users who actually USE DF nicknames (enabled defaults true,
+    -- so without this every NSRT user would get the popup with nothing to
+    -- choose between). Once they add a first nickname, the conflict is real
+    -- and the popup appears at next login (framePrecedence is still nil).
+    local hasAny = (data.entries and #data.entries > 0)
+        or (NK.received and next(NK.received) ~= nil)
+        or (data.selfNick and data.selfNick ~= "")
+    if not hasAny then return end
     if not NK:NSRTManagingNames() then return end     -- no conflict
     if InCombatLockdown and InCombatLockdown() then
         if not NK._conflictCombatWatch then

Locales/enUS.lua

@@ -1883,6 +1883,7 @@ L["Add a nickname"] = true
 L["Add from"] = true
 L["Add from:"] = true
 L["Added"] = true
+L["Addon nicknames conflict"] = true
 L["All nicknames"] = true
 L["Angle  <name>"] = true
 L["Apply to"] = true
@@ -1895,6 +1896,7 @@ L["Blocked: contained formatting codes"] = true
 L["Blocked: contains a filtered word"] = true
 L["Blocked: empty"] = true
 L["Blocked: too long"] = true
+L["Both %s and %s are set to show nicknames on your frames.\n\nWhich one should decide the names shown here?"] = true
 L["Brackets  [name]"] = true
 L["Character / text"] = true
 L["Contains"] = true
@@ -1911,6 +1913,8 @@ L["Mark nicknames"] = true
 L["Marker style"] = true
 L["Match"] = true
 L["My added"] = true
+L["Name precedence"] = true
+L["Names on frames decided by"] = true
 L["Needs re-link"] = true
 L["Nickname"] = true
 L["Nicknames"] = true
@@ -1919,6 +1923,7 @@ L["No characters found."] = true
 L["No group members found."] = true
 L["No nickname rules yet. Add one above."] = true
 L["No nicknames received yet."] = true
+L["Northern Sky Raid Tools can also show nicknames on DandersFrames frames. Choose which one decides the names shown here."] = true
 L["Overlapping rule"] = true
 L["Overlaps with rule(s) %s. For names they share, the rule higher in the list wins."] = true
 L["Overridden"] = true
@@ -1937,6 +1942,8 @@ L["Source"] = true
 L["Starts with"] = true
 L["Starts with: matches any character whose name begins with this text."] = true
 L["This Battle.net friend could not be matched after an update. Remove this rule and add them again."] = true
+L["This only changes who controls names on DandersFrames frames - you can change it later in Nicknames settings."] = true
+L["Use %s nicknames"] = true
 L["You are not in a guild."] = true
 L["Your nickname (broadcast)"] = true
 

Options/NicknamesPage.lua

@@ -777,6 +777,36 @@ function DF.BuildNicknamesPage(guiRef, pageRef, dbRef)
         recvContent:SetHeight(mmax(1, n * ROW_HEIGHT))
     end
 
+    -- ===== Name precedence (only shown when NSRT can also manage our names) =====
+    -- Northern Sky Raid Tools can also be set to put nicknames on DandersFrames
+    -- frames; when both are active they fight. This mirrors the one-time conflict
+    -- popup (Features/Nicknames.lua) so the choice can be changed here later.
+    if C_AddOns and C_AddOns.IsAddOnLoaded and C_AddOns.IsAddOnLoaded("NorthernSkyRaidTools") then
+        local precHeader = parent:CreateFontString(nil, "OVERLAY", "DFFontNormal")
+        precHeader:SetPoint("TOPLEFT", recvBg, "BOTTOMLEFT", 0, -18)
+        precHeader:SetText(L["Name precedence"])
+        do local pc = themeColor(); precHeader:SetTextColor(pc.r, pc.g, pc.b) end
+
+        local precDesc = parent:CreateFontString(nil, "OVERLAY", "DFFontDisableSmall")
+        precDesc:SetPoint("TOPLEFT", precHeader, "BOTTOMLEFT", 0, -6)
+        precDesc:SetWidth(LIST_WIDTH)
+        precDesc:SetJustifyH("LEFT")
+        precDesc:SetText(L["Northern Sky Raid Tools can also show nicknames on DandersFrames frames. Choose which one decides the names shown here."])
+
+        local precOpts = {
+            self = "DandersFrames", nsrt = "Northern Sky Raid Tools",
+            _order = { "self", "nsrt" },
+        }
+        local precDD = GUI:CreateDropdown(parent, L["Names on frames decided by"], precOpts, nil, nil, nil,
+            function() local d = NK:GetDB(); return (d and d.framePrecedence == "nsrt") and "nsrt" or "self" end,
+            function(v)
+                local d = NK:GetDB(); if d then d.framePrecedence = v end
+                NK:RefreshAllFrames()
+            end)
+        precDD:SetSize(220, 50)
+        precDD:SetPoint("TOPLEFT", precDesc, "BOTTOMLEFT", -4, -8)
+    end
+
     -- Keep this panel in sync with changes made anywhere (e.g. incoming shares).
     NK.onChange = Refresh
     Refresh()