Change storage of language list

Having each language as a separate file in a directory makes handling of the languages way easier.
2020-04-24 16:36:02 +02:00 · 2020-04-24 16:36:02 +02:00 · ec59668710
commit ec59668710
parent 53a0c4bcc4
36 changed files with 39 additions and 53 deletions
--- a/2
+++ b/2
@ -68,7 +68,7 @@ $(SUBDIRS): .FORCE
 # otherwise. This symlinks make sure that phase 2 can easily use the right file
 # for each language, also as a prerequisite in the Makefile.

-LANGUAGES := $(shell . build/languages.sh && echo `languages | cut -d\  -f1`)
+LANGUAGES := $(shell ls -xw0 global/languages)

 TEXTS_LINKS := $(foreach lang,$(LANGUAGES),tools/.texts-$(lang).xml)

--- a/build/languages.sh
+++ b/build/languages.sh
@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-
-# lazy-ass include guard
-inc_languages=true
-
-languages(){
-cat <<EOL
-ar &#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1617;&#1577;
-bg Български
-bs Bosanski
-ca Català
-cs Česky
-da Dansk
-de Deutsch
-el Ελληνικά
-en English
-es Español
-et Eesti
-fi Suomi
-fr Français
-hr Hrvatski
-hu Magyar
-it Italiano
-mk Mакедонски
-nb Norsk (bokmål)
-nl Nederlands
-nn Norsk (nynorsk)
-pl Polski
-pt Português
-ro Română
-ru Русский
-sk Slovenčina
-sl Slovenščina
-sq Shqip
-sr Српски
-sv Svenska
-tr Türkçe
-uk Українська
-zh 漢語
-EOL
-}
--- a/build/makerules.sh
+++ b/build/makerules.sh
@ -1,13 +1,12 @@
 #!/usr/bin/env bash

 inc_makerules=true
-[ -z "$inc_languages" ] && . "$basedir/build/languages.sh"

 tree_maker(){
  # walk through file tree and issue Make rules according to file type
  input="$(realpath "$1")"
  output="$(realpath "$2")"
-  languages=$(echo $(languages | cut -d\  -f1))
+  languages="$(ls -xw0 "${basedir}/global/languages")"

  cat <<EOF
 # -----------------------------------------------------------------------------
--- a/build/scaffold.sh
+++ b/build/scaffold.sh
@ -1,7 +1,6 @@
 #!/usr/bin/env bash

 inc_scaffold=true
-[ -z "$inc_languages" ] && . "$basedir/build/languages.sh"

 get_version(){
  version=$(xsltproc $basedir/build/xslt/get_version.xsl $1)
@ -33,14 +32,11 @@ list_langs(){
  # the shortname (i.e. file path with file ending omitted)
  # output is readily formatted for inclusion
  # in xml stream
-  shortname="$1"
-
-  langfilter=$(
-    echo "$shortname".[a-z][a-z].xhtml \
-    | sed -r 's;[^ ]+.([a-z]{2}).xhtml;\1;g;s; ;|;g'
-  )
-  languages | egrep "^($langfilter) " \
-  | sed -r 's:^([a-z]{2}) (.+)$:<tr id="\1">\2</tr>:g'
+  for file in "${1}".[a-z][a-z].xhtml; do
+    language="${file: -8:2}"
+    text="$(echo -n $(cat "${basedir}/global/languages/${language}"))"
+    echo "<tr id=\"${language}\">${text}</tr>"
+  done
 }

 list_sources(){
--- a/global/languages/ar
+++ b/global/languages/ar
@ -0,0 +1 @@
+&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1617;&#1577;
--- a/global/languages/bg
+++ b/global/languages/bg
@ -0,0 +1 @@
+Български
--- a/global/languages/bs
+++ b/global/languages/bs
@ -0,0 +1 @@
+Bosanski
--- a/global/languages/ca
+++ b/global/languages/ca
@ -0,0 +1 @@
+Català
--- a/global/languages/cs
+++ b/global/languages/cs
@ -0,0 +1 @@
+Česky
--- a/global/languages/da
+++ b/global/languages/da
@ -0,0 +1 @@
+Dansk
--- a/global/languages/de
+++ b/global/languages/de
@ -0,0 +1 @@
+Deutsch
--- a/global/languages/el
+++ b/global/languages/el
@ -0,0 +1 @@
+Ελληνικά
--- a/global/languages/en
+++ b/global/languages/en
@ -0,0 +1 @@
+English
--- a/global/languages/es
+++ b/global/languages/es
@ -0,0 +1 @@
+Español
--- a/global/languages/et
+++ b/global/languages/et
@ -0,0 +1 @@
+Eesti
--- a/global/languages/fi
+++ b/global/languages/fi
@ -0,0 +1 @@
+Suomi
--- a/global/languages/fr
+++ b/global/languages/fr
@ -0,0 +1 @@
+Français
--- a/global/languages/hr
+++ b/global/languages/hr
@ -0,0 +1 @@
+Hrvatski
--- a/global/languages/hu
+++ b/global/languages/hu
@ -0,0 +1 @@
+Magyar
--- a/global/languages/it
+++ b/global/languages/it
@ -0,0 +1 @@
+Italiano
--- a/global/languages/mk
+++ b/global/languages/mk
@ -0,0 +1 @@
+Mакедонски
--- a/global/languages/nb
+++ b/global/languages/nb
@ -0,0 +1 @@
+Norsk (bokmål)
--- a/global/languages/nl
+++ b/global/languages/nl
@ -0,0 +1 @@
+Nederlands
--- a/global/languages/nn
+++ b/global/languages/nn
@ -0,0 +1 @@
+Norsk (nynorsk)
--- a/global/languages/pl
+++ b/global/languages/pl
@ -0,0 +1 @@
+Polski
--- a/global/languages/pt
+++ b/global/languages/pt
@ -0,0 +1 @@
+Português
--- a/global/languages/ro
+++ b/global/languages/ro
@ -0,0 +1 @@
+Română
--- a/global/languages/ru
+++ b/global/languages/ru
@ -0,0 +1 @@
+Русский
--- a/global/languages/sk
+++ b/global/languages/sk
@ -0,0 +1 @@
+Slovenčina
--- a/global/languages/sl
+++ b/global/languages/sl
@ -0,0 +1 @@
+Slovenščina
--- a/global/languages/sq
+++ b/global/languages/sq
@ -0,0 +1 @@
+Shqip
--- a/global/languages/sr
+++ b/global/languages/sr
@ -0,0 +1 @@
+Српски
--- a/global/languages/sv
+++ b/global/languages/sv
@ -0,0 +1 @@
+Svenska
--- a/global/languages/tr
+++ b/global/languages/tr
@ -0,0 +1 @@
+Türkçe
--- a/global/languages/uk
+++ b/global/languages/uk
@ -0,0 +1 @@
+Українська
--- a/global/languages/zh
+++ b/global/languages/zh
@ -0,0 +1 @@
+漢語