distinct tfa.xml translation file

app/views/account/layout.scala

@@ -48,7 +48,7 @@ object layout {
             trans.changeUsername()
           ),
           a(activeCls("twofactor"), href := routes.Account.twoFactor())(
-            trans.settings.twoFactorAuth()
+            trans.tfa.twoFactorAuth()
           ),
           a(activeCls("security"), href := routes.Account.security())(
             trans.security()

app/views/account/twoFactor.scala

@@ -9,7 +9,7 @@ import controllers.routes
 
 object twoFactor {
 
-  import trans.settings._
+  import trans.tfa._
 
   private val qrCode = raw(
     """<div style="width: 276px; height: 276px; padding: 10px; background: white; margin: 2em auto;"><div id="qrcode" style="width: 256px; height: 256px;"></div></div>"""

app/views/team/show.scala

@@ -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.settings()
+                  trans.settings()
                 ),
               info.createdByMe option
                 a(

bin/trans-dump.js

@@ -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 settings'.split(' ');
+const dbs = 'site arena emails learn activity coordinates study clas contact patron coach broadcast streamer tfa'.split(' ');
 
 function ucfirst(s) {
   return s.charAt(0).toUpperCase() + s.slice(1);

build.sbt

@@ -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", "settings"),
+      dbs = List("site", "arena", "emails", "learn", "activity", "coordinates", "study", "class", "contact", "patron", "coach", "broadcast", "streamer", "tfa"),
       compileTo = (sourceManaged in Compile).value / "messages"
     )
   }.taskValue,

modules/i18n/src/main/I18nDb.scala

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

modules/i18n/src/main/I18nKeys.scala

@@ -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, Settings, Site, Streamer, Study }
+import I18nDb.{ Activity, Arena, Broadcast, Clas, Coach, Contact, Coordinates, Emails, Learn, Patron, Site, Streamer, Study, Tfa }
 
 // format: OFF
 object I18nKeys {
@@ -261,6 +261,7 @@ 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)
@@ -1487,19 +1488,18 @@ val `beSafe` = new Translated("beSafe", Streamer)
 val `keepItShort` = new Translated("keepItShort", Streamer)
 }
 
-object settings {
-val `settings` = new Translated("settings", Settings)
-val `twoFactorAuth` = new Translated("twoFactorAuth", Settings)
-val `twoFactorHelp` = new Translated("twoFactorHelp", Settings)
-val `twoFactorApp` = new Translated("twoFactorApp", Settings)
-val `scanTheCode` = new Translated("scanTheCode", Settings)
-val `enterPassword` = new Translated("enterPassword", Settings)
-val `authenticationCode` = new Translated("authenticationCode", Settings)
-val `ifYouLoseAccess` = new Translated("ifYouLoseAccess", Settings)
-val `enableTwoFactor` = new Translated("enableTwoFactor", Settings)
-val `disableTwoFactor` = new Translated("disableTwoFactor", Settings)
-val `twoFactorEnabled` = new Translated("twoFactorEnabled", Settings)
-val `twoFactorDisable` = new Translated("twoFactorDisable", Settings)
+object tfa {
+val `twoFactorAuth` = new Translated("twoFactorAuth", Tfa)
+val `twoFactorHelp` = new Translated("twoFactorHelp", Tfa)
+val `twoFactorApp` = new Translated("twoFactorApp", Tfa)
+val `scanTheCode` = new Translated("scanTheCode", Tfa)
+val `enterPassword` = new Translated("enterPassword", Tfa)
+val `authenticationCode` = new Translated("authenticationCode", Tfa)
+val `ifYouLoseAccess` = new Translated("ifYouLoseAccess", Tfa)
+val `enableTwoFactor` = new Translated("enableTwoFactor", Tfa)
+val `disableTwoFactor` = new Translated("disableTwoFactor", Tfa)
+val `twoFactorEnabled` = new Translated("twoFactorEnabled", Tfa)
+val `twoFactorDisable` = new Translated("twoFactorDisable", Tfa)
 }
 
 }

translation/source/site.xml

@@ -349,6 +349,7 @@
   <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>

translation/source/tfa.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-  <string name="settings">Settings</string>
   <string name="twoFactorAuth">Two-factor authentication</string>
   <string name="twoFactorHelp">Two-factor authentication adds another layer of security to your account.</string>
   <string name="twoFactorApp">Get an app for two-factor authentication, for example Google Authenticator for %s or %s.</string>