diff --git a/events/2011/event-20110920-01.en.xml b/events/2011/event-20110920-01.en.xml index 662a8ffcfd..3510b8cda8 100644 --- a/events/2011/event-20110920-01.en.xml +++ b/events/2011/event-20110920-01.en.xml @@ -12,7 +12,7 @@ front-page freedom-box - manchester-free-software + diff --git a/events/2019/event-20190408-02.en.xml b/events/2019/event-20190408-02.en.xml index 4c3786754f..2416ee2087 100644 --- a/events/2019/event-20190408-02.en.xml +++ b/events/2019/event-20190408-02.en.xml @@ -12,7 +12,7 @@ ES talk -panel + front-page diff --git a/news/2015/news-20151013-01.es.xhtml b/news/2015/news-20151013-01.es.xhtml index 12ae7902cc..8ae31ba9fc 100644 --- a/news/2015/news-20151013-01.es.xhtml +++ b/news/2015/news-20151013-01.es.xhtml @@ -79,7 +79,7 @@ las páginas webs gubernamentales.

front-page - AdministraciónPública + pdfreaders campaigns diff --git a/news/2015/news-20151030-01.de.xml b/news/2015/news-20151030-01.de.xml index 2ecde3fc88..2ee3f94102 100644 --- a/news/2015/news-20151030-01.de.xml +++ b/news/2015/news-20151030-01.de.xml @@ -19,7 +19,7 @@ front-page ch Libreboot - Laptop + diff --git a/news/2015/news-20151030-01.el.xml b/news/2015/news-20151030-01.el.xml index 69e283fed1..f0f4e21474 100644 --- a/news/2015/news-20151030-01.el.xml +++ b/news/2015/news-20151030-01.el.xml @@ -24,7 +24,7 @@ front-page ch Libreboot - Laptop + diff --git a/news/2015/news-20151030-01.en.xml b/news/2015/news-20151030-01.en.xml index 756e810ebf..1fea4b4039 100644 --- a/news/2015/news-20151030-01.en.xml +++ b/news/2015/news-20151030-01.en.xml @@ -19,7 +19,7 @@ front-page ch Libreboot - Laptop + diff --git a/news/2015/news-20151030-01.sq.xml b/news/2015/news-20151030-01.sq.xml index f230d17566..5ed0c5355b 100644 --- a/news/2015/news-20151030-01.sq.xml +++ b/news/2015/news-20151030-01.sq.xml @@ -20,7 +20,7 @@ më ekologjik të hardware-it.

front-page ch Libreboot - Laptop + diff --git a/news/2016/news-20161110-01.es.xhtml b/news/2016/news-20161110-01.es.xhtml index a04d13f686..4ea862a256 100644 --- a/news/2016/news-20161110-01.es.xhtml +++ b/news/2016/news-20161110-01.es.xhtml @@ -45,6 +45,6 @@ Los legisladores han redactado merchandise baby bib -pink + diff --git a/news/2017/news-20170726-01.de.xhtml b/news/2017/news-20170726-01.de.xhtml index 3fc45335a6..f23a7b1e3d 100644 --- a/news/2017/news-20170726-01.de.xhtml +++ b/news/2017/news-20170726-01.de.xhtml @@ -22,7 +22,7 @@ front-page merchandise baby bib - pink + diff --git a/news/2017/news-20170726-01.en.xhtml b/news/2017/news-20170726-01.en.xhtml index e8d6520baa..b1153c528e 100644 --- a/news/2017/news-20170726-01.en.xhtml +++ b/news/2017/news-20170726-01.en.xhtml @@ -22,7 +22,7 @@ front-page merchandise baby bib - pink + diff --git a/news/2017/news-20170726-01.fr.xhtml b/news/2017/news-20170726-01.fr.xhtml index 993d3644db..526b4880c9 100644 --- a/news/2017/news-20170726-01.fr.xhtml +++ b/news/2017/news-20170726-01.fr.xhtml @@ -32,7 +32,7 @@ front-page merchandise baby bib - pink + nebi diff --git a/news/2017/news-20170726-01.nl.xhtml b/news/2017/news-20170726-01.nl.xhtml index 8f7878301e..a62fc2c5ef 100644 --- a/news/2017/news-20170726-01.nl.xhtml +++ b/news/2017/news-20170726-01.nl.xhtml @@ -22,7 +22,7 @@ front-page merchandise baby bib - pink + André Ockers diff --git a/news/2017/news-20171108-01.nl.xhtml b/news/2017/news-20171108-01.nl.xhtml index ca46c23065..fa30a3b3f6 100644 --- a/news/2017/news-20171108-01.nl.xhtml +++ b/news/2017/news-20171108-01.nl.xhtml @@ -58,7 +58,7 @@ vinden op: https://reuse.software. reuse developertools - herziening + diff --git a/tools/tagtool/tagtool.sh b/tools/tagtool/tagtool.sh index ce9ca49fd3..d9e7571c1b 100755 --- a/tools/tagtool/tagtool.sh +++ b/tools/tagtool/tagtool.sh @@ -21,6 +21,17 @@ LANGUAGE= NO_ACT=0 VERBOSE=0 +log() +# log LVL MESSAGE +{ + local min_lvl="$1" + shift + if [[ VERBOSE -ge min_lvl ]] + then + echo "$@" >&2 + fi +} + print_help() { cat <&2 @@ -28,7 +39,7 @@ Usage: tagstool OPTIONS -b|--bulk-process TAGSDATAFILE tagstool OPTIONS --find-tags TAG.. tagstool OPTIONS --remove-empty-labels tagstool OPTIONS --remove-tags TAG.. - tagstool OPTIONS --remove-tags OLD NEW + tagstool OPTIONS --rename-tags OLD NEW tagstool OPTIONS --set-label LABEL [--force] TAG Transform tag data by bulk. @@ -47,12 +58,12 @@ Actions (only one action per invocation): Available transformations: - rm: delete tag - mv:newtag: move the tag to a newtag ---find-tags List all files containing the given tags. +--find-tags TAG.. List all files containing the given tags. If a non-empty language is given, the output is limited to that language. --remove-empty-labels Remove empty content attribute for tags. Not affected by --language option. ---remove-tags TAGS.. Remove the given tags. +--remove-tags TAG.. Remove the given tags. --rename-tag OLD NEW Rename the OLD tag to NEW tag in all files. --set-label LABEL Set the given label on all given tag. The tag is given as positional parameter. @@ -69,10 +80,7 @@ performAction() # If VERBOSE is set, also print the command. # Please use this for all actions that perform a change on the data! { - if [[ VERBOSE -eq 1 ]] - then - echo "${@@Q}" >&2 - fi + log 1 "${@@Q}" if [[ NO_ACT -eq 1 ]] then echo "NOT calling $1..." >&2 @@ -119,6 +127,7 @@ renameTag() do if ! fileIsLanguage "$f" "$LANGUAGE" then + log 2 "Ignoring file (language filter): $f" continue fi echo " $f" >&2 @@ -138,14 +147,15 @@ removeTag() { local tagId="$1" echo "Deleting tag $tagId..." >&2 - for f in $(findTaggedFiles "$oldTagId") + for f in $(findTaggedFiles "$tagId") do if ! fileIsLanguage "$f" "$LANGUAGE" then + log 2 "Ignoring file (language filter): $f" continue fi echo " $f" >&2 - if ! performAction sed -E -i "s;\W*\W*$TagId\W*\W*;;i" "$f" + if ! performAction sed -E -i "s;\W*\W*$tagId\W*\W*;;i" "$f" then echo "ERROR!" >&2 return 1 @@ -171,6 +181,7 @@ setTagLabel() # language is not empty if ! fileIsLanguage "$f" "$LANGUAGE" then + log 2 "Ignoring file (language filter): $f" continue fi echo " $f" >&2 @@ -248,6 +259,8 @@ action_findTags() if fileIsLanguage "$f" "$LANGUAGE" then echo "$f" + else + log 2 "Ignoring file (language filter): $f" fi done done | sort -u @@ -327,7 +340,7 @@ while true ; do --remove-tags) ACTION=action_removeTags ; shift ;; --rename-tag) ACTION=action_renameTag ; shift ;; --set-label) ACTION=action_setLabel ; LABEL="$2" ; shift 2 ;; - -v|--verbose) VERBOSE=1 ; shift ;; + -v|--verbose) let VERBOSE++ ; shift ;; --) shift ; break ;; *) echo "Internal error!" ; exit 1 ;; esac