Author: Adam <git@apiote.tk>
Merge branch 'v0.3.0' into develop
CHANGELOG.adoc | 37 +++++++++++++++++++++++++++++++------ README.adoc | 18 +++++++----------- i18n/check_translation | 42 ++++++++++++++++++++++++++++++++++++++++++ templates/index.html | 2 +-
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 0e5e075d774b81fddea55c4bd3c5ab8b200ce4a4..8125da169f7f931ea44ab97c41fe7a5f6c88f2cb 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -9,10 +9,8 @@ == Unreleased === Added -* User account -* Watchlist, Readlist -* Experience logging (watched, read) -* Next episode to watch in series +* Readlist +* Experience logging (read) * Upcoming episodes and films from watchlist * Film and series discovery * Manpages @@ -31,11 +29,38 @@ * Search pagination based on films *and* books * Show books not available in Wikidata, from Inventaire * Further optimisation (minify css, caching) * Improve based-on -* Limit tv series episode description length + +== [0.3.0] — 2020-05-23 + +=== Added + +* Watchlist (with searching) +* Showing that film in watchlist has previous, not watched part +* Marking films watched (also on another date) +* TV Queue +* Marking episodes skipped or watched +* Showing progress in TV series +* Skipping whole season 0 in TV series +* Experiences (of films and TV series) +* User account (signup and login) +* Next episode to watch in TV series +* New verbs (%a, %b, %h) in date translations + +=== Changed + +* Placeholder on the front page is cut with ellipsis +* Episode description in last and next episode are cut with ellipsis +* Updated translations +* Year is hidden if it’s unknown +* Cancelled TV series are treated like ended ones + +=== Fixed + +* Years in TV series if end year is unknown == [0.2.0] - 2020-02-10 -== Added +=== Added * Searching books (from Wikidata only). * Showing books (from Wikidata only). diff --git a/README.adoc b/README.adoc index 7ea0619e6212e41acd2f0a52e4a445bf49246319..4c4e0c57cb2c40ee7e79036cf8ce63c6a5b5cea9 100644 --- a/README.adoc +++ b/README.adoc @@ -1,6 +1,6 @@ = a·muse apiote <me@apiote.tk> -v0.2.0 (Agrajag) 2020-02-10 +v0.3.0 (Colin) 2020-03-23 :toc: a·muse is a no-JavaScript frontend for The Movie Database. It is also a system that connects films with books which the former are based on, thanks to using data from Wikidata. Finally, a·muse is also a place to collect ideas which films, books, and series watch or read next, and which of those have already been watched or read. @@ -11,26 +11,22 @@ The name of the system is ‘a·muse.’ The name of the program, command, any package is ‘amuse.’ Both are pronounced the same–[æˈʔmjuːz]. -It’s a play of words—amuse as a verb, and a muse as a goddess. +It’s a play of words—‘amuse’ as a verb, and ‘a muse’ as a goddess. == Building -To build version 0.2.x, You need: +To build version 0.3.x, You need: * `go>=1.11` * `resvg` * `cwebp` * `mk` -=== Python router - -Because `apiote.tk` runs currently on a shared hosting with no possibility of running arbitrary binaries, but with wsgi, a·muse can be built as a Python module and run with a Python router. This only works with `glibc` (https://github.com/golang/go/issues/13492[Github issue]). Furthermore, the shared hosting uses `python==3.7` so a friendly `Dockerfile` is provided. +Then, all You have to do is run `mk`, and—optionally—`mk install` -Build script is only provided in the `mkfile`, not in the `makefile`. +=== Python router -*This is a hack. You are on Your own.* - -*This is currently NOT supported.* +WARNING: Python router is deprecated == Contribute @@ -50,7 +46,7 @@ == Licence ---- -amuse Copyright (C) 2019 apiote +amuse Copyright (C) 2019–2020 apiote This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by diff --git a/i18n/check_translation b/i18n/check_translation new file mode 100755 index 0000000000000000000000000000000000000000..56d02d26d4be7d9664233e45f68f831c2a73db39 --- /dev/null +++ b/i18n/check_translation @@ -0,0 +1,42 @@ +#!/bin/sh + +if [ "$1" = '' ] +then + echo "usage check_translation <file>" + exit 1 +fi + +if [ ! -f "$1" ] +then + echo "Translation $1 does not exist" + exit 1 +fi + +default_all=$(grep -c '=' < default.toml) +default_untranslatable=$(grep -c '^#untranslatable' < default.toml) +default=$(( default_all - default_untranslatable )) + +translated_all=$(grep -c '=' < "$1") +translated_untranslatable=$(grep -c '^#untranslatable' < "$1") +translated=$(( translated_all - translated_untranslatable )) + +left=$(( default - translated )) + +if [ "$translated_untranslatable" -ne 0 ] +then + echo "Untranslatable strings in $1" + status=1 +fi + +percent=$((translated * 100 / default)) +echo "$percent% translated" + +if [ $left -gt 0 ] +then + echo "There are $left strings left to translate" +elif [ $left -eq 0 ] +then + echo "All strings translated" +fi + +exit $status diff --git a/templates/index.html b/templates/index.html index 5e848a9363630118fec2c5ff8e3a12b86f592bdb..4482091a8c1345ca945b885c4c417b05736c23de 100644 --- a/templates/index.html +++ b/templates/index.html @@ -58,7 +58,7 @@ <span class="text-grey material-icon"></span> </a> <!-- here goes translation link --> - <code class="margin-lr-1 font-_875 text-grey">v0.2.0</code> + <code class="margin-lr-1 font-_875 text-grey">v0.3.0</code> </footer> </body> </html>