diff --git a/CHANGELOG.md b/CHANGELOG.md
index 533df10..410401d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ All notable changes to this project are documented here. The project follows
- Crowdflare now offers Rackstar embedded caches through its Rackstar Partner Program (RPP). Send it at least 10 Gbps to request a free 100G box in any of your POPs, then pay only for power.
- Subsea cable upgrades ordered while the cable is still being built now move with its finish date. Hiring extra crews brings the terminal and optical-engineering upgrades forward too, construction delays push them back, and older saves with upgrades stuck waiting far too long are fixed when loaded.
- A new button hires enough crews to finish a ground or subsea cable build in one day, for the same price as hiring them one by one. Extra crews also stop once one day is left, so you no longer pay for crews that save no time (#103).
+- Messages about an exchange that already carries its city's name no longer repeat the city, so IX.brrr Campinas is no longer "IX.brrr Campinas in Campinas" (#134).
## [1.32.0] — 2026-10-27
diff --git a/site/i18n/fr.js b/site/i18n/fr.js
index 0f3642c..978dabc 100644
--- a/site/i18n/fr.js
+++ b/site/i18n/fr.js
@@ -2899,4 +2899,8 @@
"Finish in 1 day {price}":"Terminer en 1 jour {price}",
"More crews on site.
Construction is {n} days ahead.":"Des équipes en renfort.
Les travaux ont {n} jours d’avance.",
"More crews on site.
Construction is {n} day ahead.":"Des équipes en renfort.
Les travaux ont {n} jour d’avance.",
+"# {net}: {g} over transit, but it peers at {ix}, where you have a POP. Get a port there.":"# {net} : {g} via transit, mais il fait du peering sur {ix}, où tu as un POP. Prends un port là-bas.",
+"{ix} LAG":"LAG {ix}",
+"A member at {ix} leaked the full routing table into the route server. Max-prefix limits tripped everywhere. Your peering there is down.":"Un membre de {ix} a fait fuiter la table de routage complète dans le route server. Les limites max-prefix ont sauté partout. Ton peering là-bas est tombé.",
+"{net} de-peered you at {ix}.
{why} Traffic falls back to your next best path.":"{net} a coupé le peering avec toi sur {ix}.
{why} Le trafic bascule sur ton meilleur chemin suivant.",
};
diff --git a/site/i18n/it.js b/site/i18n/it.js
index 7721d33..b0afd34 100644
--- a/site/i18n/it.js
+++ b/site/i18n/it.js
@@ -2899,4 +2899,8 @@
"Finish in 1 day {price}":"Termina in 1 giorno {price}",
"More crews on site.
Construction is {n} days ahead.":"Più squadre sul posto.
I lavori sono in anticipo di {n} giorni.",
"More crews on site.
Construction is {n} day ahead.":"Più squadre sul posto.
I lavori sono in anticipo di {n} giorno.",
+"# {net}: {g} over transit, but it peers at {ix}, where you have a POP. Get a port there.":"# {net}: {g} via transit, ma fa peering a {ix}, dove hai un POP. Prendi una porta lì.",
+"{ix} LAG":"LAG {ix}",
+"A member at {ix} leaked the full routing table into the route server. Max-prefix limits tripped everywhere. Your peering there is down.":"Un membro di {ix} ha fatto leak dell’intera tabella di routing nel route server. I limiti max-prefix sono scattati ovunque. Il tuo peering lì è giù.",
+"{net} de-peered you at {ix}.
{why} Traffic falls back to your next best path.":"{net} ti ha tolto il peering su {ix}.
{why} Il traffico ripiega sul miglior percorso rimasto.",
};
diff --git a/site/i18n/pt.js b/site/i18n/pt.js
index d149aaa..f43a808 100644
--- a/site/i18n/pt.js
+++ b/site/i18n/pt.js
@@ -2899,4 +2899,8 @@
"Finish in 1 day {price}":"Concluir em 1 dia {price}",
"More crews on site.
Construction is {n} days ahead.":"Mais equipes no local.
A construção está {n} dias adiantada.",
"More crews on site.
Construction is {n} day ahead.":"Mais equipes no local.
A construção está {n} dia adiantada.",
+"# {net}: {g} over transit, but it peers at {ix}, where you have a POP. Get a port there.":"# {net}: {g} via transit, mas faz peering no {ix}, onde você tem um POP. Pegue uma porta lá.",
+"{ix} LAG":"LAG do {ix}",
+"A member at {ix} leaked the full routing table into the route server. Max-prefix limits tripped everywhere. Your peering there is down.":"Um membro do {ix} vazou a tabela de roteamento inteira no route server. Limites de max-prefix estouraram em todo lugar. Seu peering lá caiu.",
+"{net} de-peered you at {ix}.
{why} Traffic falls back to your next best path.":"{net} cortou o peering com você no {ix}.
{why} O tráfego volta para o seu próximo melhor caminho.",
};
diff --git a/site/index.html b/site/index.html
index 493ef27..d1037b4 100644
--- a/site/index.html
+++ b/site/index.html
@@ -1792,6 +1792,8 @@ const ixCity=x=>String(x).split('~')[0];
function ixIdsIn(c){const o=ixStatic(c);if(S&&S.myIx&&S.myIx[c]&&!o.includes(c))o.unshift(c);return o;}
const hasIxAt=c=>ixIdsIn(c).some(x=>S.ixp[x]!==undefined);
function ixName(c){if(XIXM[c])return XIXM[c].name;return S.myIx[c]?S.myIx[c].name:CITY[c].ix;}
+// IX.brrr Campinas already says where it is, so messages skip "in Campinas" (#134)
+const ixNamesCity=c=>String(ixName(c)||'').toLowerCase().includes(CITY[ixCity(c)].name.toLowerCase());
/* Australian exchanges follow PeeringDB (every Australian exchange's member list, Oct 2026): networks that sit on
every IX elsewhere list the Australian cities they really peer in as auIx, and the big incumbents peer only privately. */
/* Transit in Australia is sold only by carriers with an Australian site and at least ten Australian networks buying
@@ -2084,7 +2086,7 @@ function teOptimize(){const L=[tr('# Suggested by the optimizer from live traffi
const tips=[];
for(const n of NETS){const g=(R.netEg[n.id]||{}).t||0;if(g<1)continue;// The exchange where it is a member and you have no port yet, in a city where you have a POP.
let at=null;for(const c of Object.keys(S.pops)){at=ixIdsIn(c).find(x=>S.ixp[x]===undefined&&ixMembers(x).includes(n.id));if(at)break;}
- if(at)tips.push([g,tr('# {net}: {g} over transit, but it peers at {ix} in {city}, where you have a POP. Get a port there.',{net:n.name,g:fmtG(g),ix:ixName(at),city:CITY[ixCity(at)].name})]);}
+ if(at){const v={net:n.name,g:fmtG(g),ix:ixName(at),city:CITY[ixCity(at)].name};tips.push([g,ixNamesCity(at)?tr('# {net}: {g} over transit, but it peers at {ix}, where you have a POP. Get a port there.',v):tr('# {net}: {g} over transit, but it peers at {ix} in {city}, where you have a POP. Get a port there.',v)]);}}
for(const n of NETS){const g=(R.netEg[n.id]||{}).ix||0;if(g>=50&&!S.pni.some(p=>p.net===n.id))tips.push([g,tr('# {net}: {g} over the IX. A PNI would take it off the shared port.',{net:n.name,g:fmtG(g)})]);}
tips.sort((a,b)=>b[0]-a[0]).slice(0,5).forEach(x=>L.push(x[1]));
return L.join('\n');}
@@ -2704,7 +2706,7 @@ const HARMLESS=[
];
function lagsN(){const o=[];for(const t of S.transit)if((t.n||1)>=2&&!(t.down>S.day))o.push({k:'t',id:t.id,o:t,n:t.n,lab:tr('{name} transit LAG in {city}',{name:NET[t.net].name,city:CITY[t.city].name})});
for(const p of S.pni)if((p.n||1)>=2)o.push({k:'p',id:p.id,o:p,n:p.n,lab:tr('PNI LAG with {name} in {city}',{name:NET[p.net].name,city:CITY[p.city].name})});
- for(const x in S.ixp){const n=(S.ixn||{})[x]||1;if(n>=2&&!S.myIx[x])o.push({k:'ix',id:x,n,lab:tr('{ix} LAG in {city}',{ix:ixName(x),city:CITY[ixCity(x)].name})});}return o;}
+ for(const x in S.ixp){const n=(S.ixn||{})[x]||1;if(n>=2&&!S.myIx[x])o.push({k:'ix',id:x,n,lab:ixNamesCity(x)?tr('{ix} LAG',{ix:ixName(x)}):tr('{ix} LAG in {city}',{ix:ixName(x),city:CITY[ixCity(x)].name})});}return o;}
// Where the junk comes in: one of the city's live uplinks, or just "the edge" if it has none yet.
function ddosEntry(c){const o=[];
for(const t of S.transit)if(t.city===c&&!(t.down>S.day))o.push({k:'t',id:t.id,lab:tr('{net} transit',{net:NET[t.net].name})});
@@ -2826,7 +2828,7 @@ function fireFailure(){
addInc({type,ref:c,until:pp.down,msg:msg+(type==='oops'&&(pp.routers||1)>=2?' '+tr('Automation pushed it to every router, so redundancy did not help.'):''),cost:1500,fix:type==='oops'?tr('Roll back the config'):tr('Hide the vacuum')});
}else if(type==='maxpfx'){
const c=pick(Object.keys(S.ixp));S.ev.ixdown=S.ev.ixdown||{};S.ev.ixdown[c]=Math.max(S.ev.ixdown[c]||0,S.day+1+Math.floor(Math.random()*2));
- addInc({type,ref:c,until:S.ev.ixdown[c],msg:tr('A member at {ix} leaked the full routing table into the route server. Max-prefix limits tripped everywhere. Your peering there, in {city}, is down.',{ix:ixName(c),city:CITY[ixCity(c)].name}),cost:0});
+ addInc({type,ref:c,until:S.ev.ixdown[c],msg:ixNamesCity(c)?tr('A member at {ix} leaked the full routing table into the route server. Max-prefix limits tripped everywhere. Your peering there is down.',{ix:ixName(c)}):tr('A member at {ix} leaked the full routing table into the route server. Max-prefix limits tripped everywhere. Your peering there, in {city}, is down.',{ix:ixName(c),city:CITY[ixCity(c)].name}),cost:0});
}else if(type==='prepend'){
const t=pick(S.transit);t.down=Math.max(t.down||0,S.day+2);addInc({type,ref:t.id,until:t.down,msg:tr('{net} fat-fingered a route-map and prepended your AS {n} times in {city}. Nobody wants that path.',{net:NET[t.net].name,n:30+Math.floor(Math.random()*60),city:CITY[t.city].name}),cost:0});
}else if(type==='rpki'){
@@ -2991,7 +2993,7 @@ function dayTick(){
if(S.scn&&S.scn.id==='redsea')S.stats.asiaRun=asiaG()>=RS_G?(S.stats.asiaRun||0)+1:0;
if(S.ev.php===d)toast(tr('The internet is back.
Half of it, anyway. Everything was patched in a hurry and nobody learned anything.'),'good');
for(const k in S.peers){const [id,c]=k.split('@'),sn=snub(id,c);if(!sn)continue;delete S.peers[k];S.stats.depeered=(S.stats.depeered||0)+1;
- toast(tr('{net} de-peered you at {ix} in {city}.
{why} Traffic falls back to your next best path.',{net:esc(NET[id].name),ix:esc(ixName(c)),city:esc(CITY[ixCity(c)].name),why:esc(sn.why)}),'bad');}
+ {const v={net:esc(NET[id].name),ix:esc(ixName(c)),city:esc(CITY[ixCity(c)].name),why:esc(sn.why)};toast(ixNamesCity(c)?tr('{net} de-peered you at {ix}.
{why} Traffic falls back to your next best path.',v):tr('{net} de-peered you at {ix} in {city}.
{why} Traffic falls back to your next best path.',v),'bad');}}
if(S.cnLic&&S.cnLic.state==='pending'&&d>=S.cnLic.ready){S.cnLic.state='ok';toast(tr('License granted!
Your joint venture can now build POPs in mainland China.'),'goal');sfx('coin');}
// resolve incidents
for(const i of S.inc.slice())if(i.until<=d){const o=incOpen(i),l=o&&o.a==='link'&&S.links.find(x=>x.id===o.v),where=l?CITY[l.a].name+'–'+CITY[l.b].name:o&&o.a==='city'?CITY[o.v].name:'';clearInc(i);
@@ -3952,7 +3954,7 @@ function svgChart(rows,stackKeys,lines,fmtY){
let IXMR=null,IXMC={};const ixHas=(x,id)=>{if(IXMR!==R){IXMR=R;IXMC={};}return (IXMC[x]||(IXMC[x]=new Set(ixMembers(x)))).has(id);};
function offTransitHint(id,city){const n=NET[id];if(n.type==='t1')return tr('Tier 1: only a PNI, and only once you are big enough for the Tier 1 club');
const ixc=Object.keys(S.pops).flatMap(ixIdsIn).filter(x=>ixHas(x,id)),here=city&&ixIdsIn(city).find(x=>ixHas(x,id))||null,pick1=here||ixc.find(x=>S.ixp[x]!==undefined)||ixc[0];
- if(n.pol==='open'){if(pick1)return here?tr('Open peer: join the route server at {ix}',{ix:ixName(pick1)}):tr('Open peer: join the route server at {ix} ({city})',{ix:ixName(pick1),city:CITY[ixCity(pick1)].name});const x=nearestSpot(id);return x?tr('Open peer, but not on any IX where you have a POP. Nearest: {city}',{city:CITY[x.c].name}):tr('Open peer, but not on any IX where you have a POP');}
+ if(n.pol==='open'){if(pick1)return here||ixNamesCity(pick1)?tr('Open peer: join the route server at {ix}',{ix:ixName(pick1)}):tr('Open peer: join the route server at {ix} ({city})',{ix:ixName(pick1),city:CITY[ixCity(pick1)].name});const x=nearestSpot(id);return x?tr('Open peer, but not on any IX where you have a POP. Nearest: {city}',{city:CITY[x.c].name}):tr('Open peer, but not on any IX where you have a POP');}
if(n.pol==='paid')return paidFree(n)?tr('Peers with you for free over a PNI. You got too big to charge.'):n.freeLv?tr('Paid peering only: a PNI costs {price}/mo. Free from customer level {n}.',{price:fmt$(n.paidFee),n:n.freeLv}):tr('Paid peering only: a PNI costs {price}/mo',{price:fmt$(n.paidFee)});
const pniC=Object.keys(S.pops).filter(c=>n.pops.includes(c));const ixOk=pick1?peerOk(id,'ix',pick1):null,pOk=pniC.length?peerOk(id,'pni',pniC.includes(city)?city:pniC[0]):null;
if(pOk&&pOk.ok)return tr('Ready for a PNI in {city}',{city:CITY[pniC.includes(city)?city:pniC[0]].name});
diff --git a/tests/issues.test.js b/tests/issues.test.js
index e04bbb1..3834891 100644
--- a/tests/issues.test.js
+++ b/tests/issues.test.js
@@ -1298,3 +1298,20 @@ test('#126 you can zoom in far enough, and pick a short link between two close c
assert.equal(ev(`pickCity(${o.sx},${o.sy})`), null);
assert.deepEqual(errors, []);
});
+
+test('#134 an exchange named after its city does not repeat the city in messages', () => {
+ const { ev, errors } = load();
+ base(ev);
+ assert.equal(ev("ixNamesCity('cpq')"), true);
+ assert.equal(ev("ixNamesCity('fra')"), false);
+ ev("ACT.buildPop({city:'cpq'});ACT.buyIx({city:'cpq',tier:1,signed:true});ACT.buyIx({city:'fra',tier:1,signed:true});S.ixn={cpq:2,fra:2}");
+ assert.equal(ev("S.ixp.cpq!==undefined&&S.ixp.fra!==undefined"), true);
+ const labs = JSON.parse(ev("JSON.stringify(lagsN().filter(o=>o.k==='ix').map(o=>o.lab))"));
+ assert.ok(labs.includes('IX.brrr Campinas LAG'), labs.join(' | '));
+ assert.ok(labs.some(l => / LAG in Frankfurt$/.test(l)), labs.join(' | '));
+ ev("S.inc=[];eval('('+fireFailure.toString().replace('type=pick(f);}',\"type='maxpfx';}\").replace(\"const c=pick(Object.keys(S.ixp));\",\"const c='cpq';\")+')')()");
+ const msg = ev("S.inc.map(i=>i.msg).join(' ')");
+ assert.match(msg, /IX\.brrr Campinas/);
+ assert.doesNotMatch(msg, /in Campinas/);
+ assert.deepEqual(errors, []);
+});