refactor: stats column getName, remove localeKey

Author: arildm

app/scripts/components/statistics/statistics.ts

@@ -254,16 +254,6 @@ angular.module("korpApp").component("statistics", {
                         createExamplesTask,
                     )
 
-                    const refreshHeaders = () =>
-                        $(".localized-header .slick-column-name")
-                            .not("[rel^=localize]")
-                            .each(function () {
-                                ;($(this) as JQueryExtended).localeKey($(this).text())
-                            })
-
-                    grid.onHeaderCellRendered.subscribe((e, args) => refreshHeaders())
-
-                    refreshHeaders()
                     $(window).trigger("resize")
 
                     updateGraphBtnState()

app/scripts/jq_extensions.js

@@ -1,12 +1,3 @@
-import { loc } from "@/i18n"
-
-$.fn.localeKey = function (key) {
-    this.each(function () {
-        $(this).attr("rel", `localize[${key}]`).html(loc(key))
-    })
-    return this
-}
-
 /*
  * A file generation plugin modified from that by Martin Angelov:
  * http://tutorialzine.com/2011/05/generating-files-javascript-php/

app/scripts/jquery.types.ts

@@ -1,8 +1,6 @@
 export type JQueryExtended<T = HTMLElement> = JQuery<T> & {
     // Defined in /app/lib/jquery.localize.js, a modified version of jquery-localize
     localize: () => JQueryExtended<T>
-    // Defined in jq_extensions
-    localeKey: (key: string) => JQueryExtended<T>
 }
 
 export type JQueryStaticExtended = JQueryStatic & {

app/scripts/statistics/statistics-grid.ts

@@ -7,9 +7,8 @@ import "slickgrid/slick.grid.css"
 import { Dataset, isTotalRow, Row, SingleRow } from "./statistics.types"
 import { StoreService } from "@/services/store"
 import settings from "@/settings"
-import { locObj } from "@/i18n"
+import { loc, locObj } from "@/i18n"
 import { formatFrequency } from "@/i18n/util"
-import { LangString } from "@/i18n/types"
 import { zip } from "lodash"
 import { corpusListing } from "@/corpora/corpus_listing"
 
@@ -74,7 +73,7 @@ export class StatisticsGrid extends Slick.Grid<Row> {
     refreshColumns() {
         const columns = this.getColumns() as SlickgridColumn[]
         columns.forEach((column) => {
-            if (column.translation) column.name = locObj(column.translation, this.store.lang)
+            if (column.getName) column.name = column.getName(this.store.lang)
         })
         this.setColumns(columns)
     }
@@ -109,7 +108,7 @@ function createColumns(store: StoreService, corpora: string[], attrs: string[]):
         if (reduceVal == null || reduceValLabel == null) break
         columns.push({
             id: reduceVal,
-            translation: reduceValLabel,
+            getName: (lang) => locObj(reduceValLabel!, lang),
             field: "hit_value",
             sortable: true,
             formatter: (row, cell, value, columnDef, data: Row) => {
@@ -135,7 +134,7 @@ function createColumns(store: StoreService, corpora: string[], attrs: string[]):
 
     columns.push({
         id: "total",
-        name: "stats_total",
+        getName: (lang) => loc("stats_total", lang),
         field: "total",
         sortable: true,
         defaultSortAsc: false,
@@ -151,7 +150,7 @@ function createColumns(store: StoreService, corpora: string[], attrs: string[]):
     corpora.forEach((id) =>
         columns.push({
             id,
-            translation: settings.corpora[id.toLowerCase()].title,
+            getName: (lang) => locObj(settings.corpora[id.toLowerCase()].title, lang),
             field: "count",
             sortable: true,
             defaultSortAsc: false,
@@ -168,5 +167,5 @@ function createColumns(store: StoreService, corpora: string[], attrs: string[]):
 }
 
 type SlickgridColumn = Slick.Column<Dataset> & {
-    translation?: LangString
+    getName?: (lang: string) => string
 }