Skip to content

Add French language support to internationalization system #190

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

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
+39 −15
Draft

Add French language support to internationalization system #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e58d222
Initial plan
Copilot Sep 28, 2025
594ccbc
Add French language support to toughradius internationalization system
Copilot Sep 28, 2025
977d90d
Remove binary from repository and update gitignore
Copilot Sep 28, 2025
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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ __debug_bin
log_info.log
__debug_bin*
.log
debian
debiantoughradius-bin
11 changes: 8 additions & 3 deletions app/i18n.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const (
TransLateSettings = "settings"
ZhCN = "zh_CN"
EnUS = "en_US"
FrFR = "fr_FR"
)

func (a *Application) TransDB() (*bolt.DB, error) {
Expand All @@ -39,6 +40,10 @@ func (a *Application) TransDB() (*bolt.DB, error) {
if err != nil {
log.Errorf("create en_US bucket: %s", err)
}
_, err = tx.CreateBucketIfNotExists([]byte(FrFR)) // ③
if err != nil {
log.Errorf("create fr_FR bucket: %s", err)
}
return nil
})

Expand Down Expand Up @@ -66,7 +71,7 @@ func (a *Application) GetTranslateLang() string {
}

func (a *Application) SetTranslateLang(lang string) {
if !common.InSlice(lang, []string{ZhCN, EnUS}) {
if !common.InSlice(lang, []string{ZhCN, EnUS, FrFR}) {
return
}
transdb, err := a.TransDB()
Expand Down Expand Up @@ -272,7 +277,7 @@ func (a *Application) TranslateUpdate(lang, module, src, value string) string {
}

func (a *Application) RenderTranslateFiles() {
langs := []string{ZhCN, EnUS}
langs := []string{ZhCN, EnUS, FrFR}
for _, lang := range langs {
r := a.LoadTranslateDict(lang)
os.WriteFile(path.Join(a.appConfig.System.Workdir, "data", "trans_"+lang+".js"), []byte("window.GlobalTrans="+common.ToJson(r)), 0666)
Expand All @@ -289,7 +294,7 @@ func (a *Application) RemoveTranslateItems(items []TransTable) {
return
}
defer tx.Rollback()
langs := []string{ZhCN, EnUS}
langs := []string{ZhCN, EnUS, FrFR}
for _, lang := range langs {
b := tx.Bucket([]byte(lang))
if b == nil {
Expand Down
3 changes: 3 additions & 0 deletions app/pagefunc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ func (a *Application) GetTemplateFuncMap() map[string]interface{} {
}
return "0"
},
"currentlang": func() string {
return a.GetTranslateLang()
},
"moontheme": func() string {
theme := a.GetSystemTheme()
if theme == "dark" {
Expand Down
19 changes: 14 additions & 5 deletions assets/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,23 @@
}
},
{
view: "switch", onLabel: "中文", offLabel: "English", value: "{{zhlang}}", width: 100,
view: "richselect",
value: "{{currentlang}}",
width: 100,
options: [
{ id: "en_US", value: "English" },
{ id: "zh_CN", value: "中文" },
{ id: "fr_FR", value: "Français" }
],
on: {
onChange: function (newValue, oldValue, config) {
webix.delay(function () {
webix.ajax().get("/admin/translate/switch/" + newValue).then(function (resp) {
window.location.reload()
if (newValue !== oldValue) {
webix.delay(function () {
webix.ajax().get("/admin/translate/switch/" + newValue).then(function (resp) {
window.location.reload()
})
})
})
}
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion assets/templates/translate.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{
view: "radio",
name: "lang",
options: ["zh_CN", "en_US"],
options: ["zh_CN", "en_US", "fr_FR"],
label: gtr("Language"),
labelWidth: 100,
},
Expand Down
17 changes: 12 additions & 5 deletions controllers/translate/translate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,17 @@ func InitRouter() {
return c.File(lfile)
})

webserver.GET("/admin/translate/switch/:iszh", func(c echo.Context) error {
if c.Param("iszh") == "1" {
app.GApp().SetTranslateLang(app.ZhCN)
} else {
app.GApp().SetTranslateLang(app.EnUS)
webserver.GET("/admin/translate/switch/:lang", func(c echo.Context) error {
lang := c.Param("lang")
// Handle legacy binary switch for backward compatibility
if lang == "1" {
lang = app.ZhCN
} else if lang == "0" {
lang = app.EnUS
}
// Validate the language code
if lang == app.ZhCN || lang == app.EnUS || lang == app.FrFR {
app.GApp().SetTranslateLang(lang)
}
return c.JSON(http.StatusOK, web.RestSucc("success"))
})
Expand Down Expand Up @@ -156,6 +162,7 @@ func InitRouter() {

app.GApp().Translate(app.ZhCN, form.Module, form.Key, form.Value)
app.GApp().Translate(app.EnUS, form.Module, form.Key, form.Value)
app.GApp().Translate(app.FrFR, form.Module, form.Key, form.Value)
return c.JSON(http.StatusOK, web.RestSucc("success"))
})

Expand Down