join and simplify "sort by"

app/views/search/bits.scala

@@ -155,10 +155,10 @@ private object bits {
     )
 
     def sort = tr(
-      th(label(trans.search.sort())),
+      th(label(trans.search.sortBy())),
       td(
-        div(cls := "half")(by(), " ", form3.select(form("sort")("field"), Sorting.fields)),
-        div(cls := "half")(order(), " ", form3.select(form("sort")("order"), Sorting.orders))
+        div(cls := "half")(form3.select(form("sort")("field"), Sorting.fields)),
+        div(cls := "half")(form3.select(form("sort")("order"), Sorting.orders))
       )
     )
 

modules/i18n/src/main/I18nKeys.scala

@@ -1568,9 +1568,7 @@ val `nbTurns` = new I18nKey("search:nbTurns")
 val `result` = new I18nKey("search:result")
 val `winnerColor` = new I18nKey("search:winnerColor")
 val `date` = new I18nKey("search:date")
-val `sort` = new I18nKey("search:sort")
-val `by` = new I18nKey("search:by")
-val `order` = new I18nKey("search:order")
+val `sortBy` = new I18nKey("search:sortBy")
 val `analysis` = new I18nKey("search:analysis")
 val `onlyAnalysed` = new I18nKey("search:onlyAnalysed")
 val `searchInXGames` = new I18nKey("search:searchInXGames")

translation/source/search.xml

@@ -21,9 +21,7 @@
   <string name="result">Result</string>
   <string name="winnerColor">Winner color</string>
   <string name="date">Date</string>
-  <string name="sort">Sort</string>
-  <string name="by">By</string>
-  <string name="order">Order</string>
+  <string name="sortBy">Sort by</string>
   <string name="analysis">Analysis</string>
   <string name="onlyAnalysed">Only games where a computer analysis is available</string>
 </resources>