Skip to content

fix: replace leftover /en URL prefix with /en_US after locale rename #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
khanyipu wants to merge 1 commit into from
Closed

fix: replace leftover /en URL prefix with /en_US after locale rename #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions assets/ts/settings-overlay.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ export function initSettingsOverlay() {
}

const syncLanguage = (lang: string) => {
// Normalize language string
const isEn = lang.toLowerCase().startsWith('en_US');
// Normalize language string (html lang is hyphenated, e.g. "en-US")
const isEn = lang.toLowerCase().startsWith('en');
const textAttr = isEn ? 'data-i18n-en' : 'data-i18n-zh';
const ariaAttr = isEn ? 'data-i18n-aria-en' : 'data-i18n-aria-zh';

Expand Down
2 changes: 1 addition & 1 deletion assets/ts/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

// Polyfill translation lookup on client-side for dynamic updates
// Since we don't have a JS i18n bundle, we'll derive translation from language
const isEn = window.location.pathname.startsWith('/en');
const isEn = window.location.pathname.startsWith('/en_US');

const translations = {
'zh_CN': {
Expand Down
2 changes: 1 addition & 1 deletion internal/embedded/static/js/settings-overlay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ function initSettingsOverlay() {
updateClockCursorState();
}
const syncLanguage = (lang) => {
const isEn = lang.toLowerCase().startsWith("en_US");
const isEn = lang.toLowerCase().startsWith("en");
const textAttr = isEn ? "data-i18n-en" : "data-i18n-zh";
const ariaAttr = isEn ? "data-i18n-aria-en" : "data-i18n-aria-zh";
document.body.querySelectorAll(`[${textAttr}]`).forEach((el) => {
Expand Down
2 changes: 1 addition & 1 deletion internal/embedded/static/js/theme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// assets/ts/theme.ts
(function() {
const root = document.documentElement;
const isEn = window.location.pathname.startsWith("/en");
const isEn = window.location.pathname.startsWith("/en_US");
const translations = {
"zh_CN": {
"theme.light": "\u6D45\u8272",
Expand Down
2 changes: 1 addition & 1 deletion internal/embedded/templates/pages/note.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<article class="note" data-has-mermaid="{{if .Note.HasMermaid}}true{{else}}false{{end}}" data-has-math="{{if .Note.HasMath}}true{{else}}false{{end}}">
<header class="note-header">
<div class="note-title-wrapper">
<a class="note-back-link" href="{{if eq .Lang "en_US"}}/en{{end}}/notes/" aria-label="{{T .Lang "action.back"}}">
<a class="note-back-link" href="{{if eq .Lang "en_US"}}/en_US{{end}}/notes/" aria-label="{{T .Lang "action.back"}}">
<span class="material-symbol" aria-hidden="true">arrow_back</span>
</a>
<h1 class="note-title">
Expand Down
2 changes: 1 addition & 1 deletion internal/embedded/templates/pages/tag.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="notes-page">
<section class="notes-list article-stage" aria-label="{{.PageTitle}}">
<div class="tag-back-container">
<a class="tag-back-btn" aria-label="{{T .Lang "action.back"}}" href="{{if eq .Lang "en_US"}}/en{{end}}/notes/">
<a class="tag-back-btn" aria-label="{{T .Lang "action.back"}}" href="{{if eq .Lang "en_US"}}/en_US{{end}}/notes/">
<span class="material-symbol" aria-hidden="true">arrow_back</span>
</a>
<h2 class="tag-back-title">{{.PageTitle}}</h2>
Expand Down
10 changes: 5 additions & 5 deletions internal/embedded/templates/partials/header-nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{{define "header_nav"}}
<header class="site-header">
<nav class="site-nav" aria-label="主导航">
<a class="nav-link" href="{{if eq .Lang "en_US"}}/en{{end}}/">
<a class="nav-link" href="{{if eq .Lang "en_US"}}/en_US{{end}}/">
<span class="nav-icon material-symbol" aria-hidden="true">home</span>
<span class="nav-label">{{T .Lang "nav.home"}}</span>
</a>
<a class="nav-link" href="{{if eq .Lang "en_US"}}/en{{end}}/notes/">
<a class="nav-link" href="{{if eq .Lang "en_US"}}/en_US{{end}}/notes/">
<span class="nav-icon material-symbol" aria-hidden="true">article</span>
<span class="nav-label">{{T .Lang "nav.notes"}}</span>
</a>
<a class="nav-link" href="{{if eq .Lang "en_US"}}/en{{end}}/archive/">
<a class="nav-link" href="{{if eq .Lang "en_US"}}/en_US{{end}}/archive/">
<span class="nav-icon material-symbol" aria-hidden="true">archive</span>
<span class="nav-label">{{T .Lang "nav.archive"}}</span>
</a>
<a class="nav-link" href="{{if eq .Lang "en_US"}}/en{{end}}/graph/">
<a class="nav-link" href="{{if eq .Lang "en_US"}}/en_US{{end}}/graph/">
<span class="nav-icon material-symbol" aria-hidden="true">account_tree</span>
<span class="nav-label">{{T .Lang "nav.graph"}}</span>
</a>
<a class="nav-link" href="{{if eq .Lang "en_US"}}/en{{end}}/about/">
<a class="nav-link" href="{{if eq .Lang "en_US"}}/en_US{{end}}/about/">
<span class="nav-icon material-symbol" aria-hidden="true">info</span>
<span class="nav-label">{{T .Lang "nav.about"}}</span>
</a>
Expand Down
10 changes: 5 additions & 5 deletions internal/embedded/templates/partials/mobile-drawer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
<aside class="mobile-drawer" id="mobile-drawer" aria-label="移动端导航" aria-hidden="true">
<div class="mobile-drawer-content">
<nav class="mobile-drawer-nav" aria-label="主导航">
<a class="drawer-nav-link" href="{{if eq .Lang "en_US"}}/en{{end}}/">
<a class="drawer-nav-link" href="{{if eq .Lang "en_US"}}/en_US{{end}}/">
<span class="material-symbol" aria-hidden="true">home</span>
<span class="drawer-nav-label">{{T .Lang "nav.home"}}</span>
</a>
<a class="drawer-nav-link" href="{{if eq .Lang "en_US"}}/en{{end}}/notes/">
<a class="drawer-nav-link" href="{{if eq .Lang "en_US"}}/en_US{{end}}/notes/">
<span class="material-symbol" aria-hidden="true">article</span>
<span class="drawer-nav-label">{{T .Lang "nav.notes"}}</span>
</a>
<a class="drawer-nav-link" href="{{if eq .Lang "en_US"}}/en{{end}}/archive/">
<a class="drawer-nav-link" href="{{if eq .Lang "en_US"}}/en_US{{end}}/archive/">
<span class="material-symbol" aria-hidden="true">archive</span>
<span class="drawer-nav-label">{{T .Lang "nav.archive"}}</span>
</a>
<a class="drawer-nav-link" href="{{if eq .Lang "en_US"}}/en{{end}}/graph/">
<a class="drawer-nav-link" href="{{if eq .Lang "en_US"}}/en_US{{end}}/graph/">
<span class="material-symbol" aria-hidden="true">account_tree</span>
<span class="drawer-nav-label">{{T .Lang "nav.graph"}}</span>
</a>
<a class="drawer-nav-link" href="{{if eq .Lang "en_US"}}/en{{end}}/about/">
<a class="drawer-nav-link" href="{{if eq .Lang "en_US"}}/en_US{{end}}/about/">
<span class="material-symbol" aria-hidden="true">info</span>
<span class="drawer-nav-label">{{T .Lang "nav.about"}}</span>
</a>
Expand Down
10 changes: 5 additions & 5 deletions internal/embedded/templates/partials/side-nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@
</a>

<nav class="side-nav" aria-label="主导航" data-transition-region="side-nav">
<a class="nav-link" href="{{if eq .Lang "en_US"}}/en{{end}}/">
<a class="nav-link" href="{{if eq .Lang "en_US"}}/en_US{{end}}/">
<span class="nav-icon material-symbol" aria-hidden="true">home</span>
<span class="nav-label">{{T .Lang "nav.home"}}</span>
</a>
<a class="nav-link" href="{{if eq .Lang "en_US"}}/en{{end}}/notes/">
<a class="nav-link" href="{{if eq .Lang "en_US"}}/en_US{{end}}/notes/">
<span class="nav-icon material-symbol" aria-hidden="true">article</span>
<span class="nav-label">{{T .Lang "nav.notes"}}</span>
</a>
<a class="nav-link" href="{{if eq .Lang "en_US"}}/en{{end}}/archive/">
<a class="nav-link" href="{{if eq .Lang "en_US"}}/en_US{{end}}/archive/">
<span class="nav-icon material-symbol" aria-hidden="true">archive</span>
<span class="nav-label">{{T .Lang "nav.archive"}}</span>
</a>
<a class="nav-link" href="{{if eq .Lang "en_US"}}/en{{end}}/graph/">
<a class="nav-link" href="{{if eq .Lang "en_US"}}/en_US{{end}}/graph/">
<span class="nav-icon material-symbol" aria-hidden="true">account_tree</span>
<span class="nav-label">{{T .Lang "nav.graph"}}</span>
</a>
<a class="nav-link" href="{{if eq .Lang "en_US"}}/en{{end}}/about/">
<a class="nav-link" href="{{if eq .Lang "en_US"}}/en_US{{end}}/about/">
<span class="nav-icon material-symbol" aria-hidden="true">info</span>
<span class="nav-label">{{T .Lang "nav.about"}}</span>
</a>
Expand Down
2 changes: 1 addition & 1 deletion internal/render/render.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ func (r Renderer) render(outputPath, pageTemplate string, data any) error {
"tagURL": func(lang, tag string) template.URL {
prefix := ""
if lang == "en_US" {
prefix = "/en"
prefix = "/en_US"
}
return template.URL(prefix + "/tags/" + seo.TagSlug(tag) + "/")
},
Expand Down
4 changes: 2 additions & 2 deletions internal/site/site.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ func Build(options Options) (BuildResult, error) {
}
altPrefix := ""
if altL == "en_US" {
altPrefix = "/en"
altPrefix = "en_US"
}
noteAlternates = append(noteAlternates, seo.Alternate{
Lang: altL,
Expand Down Expand Up @@ -1187,7 +1187,7 @@ func collectTagLinksForLang(groups []*content.ArticleGroup, lang string, tagRegi

langPrefix := ""
if lang == "en_US" {
langPrefix = "/en"
langPrefix = "en_US"
}

links := make([]render.TagLink, 0, len(canonicalIDs))
Expand Down