bootstrap settings.xml

pull/6012/head
Thibault Duplessis 2020-02-09 15:37:39 -06:00
parent 976ced416d
commit 8bcca0da81
8 changed files with 23 additions and 10 deletions

View File

@ -9,6 +9,8 @@ import controllers.routes
object close {
import trans.settings._
def apply(u: lila.user.User, form: play.api.data.Form[_], managed: Boolean)(implicit ctx: Context) =
account.layout(
title = s"${u.username} - ${trans.closeAccount.txt()}",
@ -21,9 +23,7 @@ object close {
else
postForm(cls := "form3", action := routes.Account.closeConfirm)(
div(cls := "form-group")(trans.closeAccountExplanation()),
div(cls := "form-group")(
"You will not be allowed to open a new account with the same name, even if the case is different."
),
div(cls := "form-group")(cantOpenSimilarAccount()),
form3.passwordModified(form("passwd"), trans.password())(autofocus, autocomplete := "off"),
form3.actions(
frag(
@ -31,7 +31,7 @@ object close {
form3.submit(
trans.closeAccount(),
icon = "j".some,
confirm = "Closing is definitive. There is no going back. Are you sure?".some,
confirm = closingIsDefinitive.txt().some,
klass = "button-red"
)
)

View File

@ -70,7 +70,7 @@ object show {
),
(info.createdByMe || isGranted(_.Admin)) option
a(href := routes.Team.edit(t.id), cls := "button button-empty text", dataIcon := "%")(
trans.settings()
trans.settings.settings()
),
info.createdByMe option
a(

View File

@ -2,7 +2,7 @@ const fs = require('fs-extra');
const parseString = require('xml2js').parseString;
const baseDir = 'translation/source';
const dbs = 'site arena emails learn activity coordinates study clas contact patron coach broadcast streamer tfa'.split(' ');
const dbs = 'site arena emails learn activity coordinates study clas contact patron coach broadcast streamer tfa settings'.split(' ');
function ucfirst(s) {
return s.charAt(0).toUpperCase() + s.slice(1);

View File

@ -76,7 +76,7 @@ lazy val i18n = module("i18n",
MessageCompiler(
sourceDir = new File("translation/source"),
destDir = new File("translation/dest"),
dbs = List("site", "arena", "emails", "learn", "activity", "coordinates", "study", "class", "contact", "patron", "coach", "broadcast", "streamer", "tfa"),
dbs = "site arena emails learn activity coordinates study class contact patron coach broadcast streamer tfa settings".split(' ').toList,
compileTo = (sourceManaged in Compile).value / "messages"
)
}.taskValue,

View File

@ -19,6 +19,7 @@ object I18nDb {
case object Broadcast extends Ref
case object Streamer extends Ref
case object Tfa extends Ref
case object Settings extends Ref
val site: Messages = lila.i18n.db.site.Registry.load
val arena: Messages = lila.i18n.db.arena.Registry.load
@ -34,6 +35,7 @@ object I18nDb {
val broadcast: Messages = lila.i18n.db.broadcast.Registry.load
val streamer: Messages = lila.i18n.db.streamer.Registry.load
val tfa: Messages = lila.i18n.db.tfa.Registry.load
val settings: Messages = lila.i18n.db.settings.Registry.load
def apply(ref: Ref): Messages = ref match {
case Site => site
@ -50,6 +52,7 @@ object I18nDb {
case Broadcast => broadcast
case Streamer => streamer
case Tfa => tfa
case Settings => settings
}
val langs: Set[Lang] = site.keys.toSet

View File

@ -1,7 +1,7 @@
// Generated with bin/trans-dump.js
package lila.i18n
import I18nDb.{ Activity, Arena, Broadcast, Clas, Coach, Contact, Coordinates, Emails, Learn, Patron, Site, Streamer, Study, Tfa }
import I18nDb.{ Activity, Arena, Broadcast, Clas, Coach, Contact, Coordinates, Emails, Learn, Patron, Settings, Site, Streamer, Study, Tfa }
// format: OFF
object I18nKeys {
@ -261,7 +261,6 @@ val `xJoinedTeamY` = new Translated("xJoinedTeamY", Site)
val `xCreatedTeamY` = new Translated("xCreatedTeamY", Site)
val `averageElo` = new Translated("averageElo", Site)
val `location` = new Translated("location", Site)
val `settings` = new Translated("settings", Site)
val `filterGames` = new Translated("filterGames", Site)
val `reset` = new Translated("reset", Site)
val `apply` = new Translated("apply", Site)
@ -1502,4 +1501,10 @@ val `twoFactorEnabled` = new Translated("twoFactorEnabled", Tfa)
val `twoFactorDisable` = new Translated("twoFactorDisable", Tfa)
}
object settings {
val `settings` = new Translated("settings", Settings)
val `closingIsDefinitive` = new Translated("closingIsDefinitive", Settings)
val `cantOpenSimilarAccount` = new Translated("cantOpenSimilarAccount", Settings)
}
}

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources>
<string name="settings">Settings</string>
<string name="closingIsDefinitive">Closing is definitive. There is no going back. Are you sure?</string>
<string name="cantOpenSimilarAccount">You will not be allowed to open a new account with the same name, even if the case is different.</string>
</resources>

View File

@ -349,7 +349,6 @@
<string name="xCreatedTeamY">%1$s created team %2$s</string>
<string name="averageElo">Average rating</string>
<string name="location">Location</string>
<string name="settings">Settings</string>
<string name="filterGames">Filter games</string>
<string name="reset">Reset</string>
<string name="apply">Submit</string>