Replace Twitter account URL with Mastodon one

CHANGELOG

@@ -1,5 +1,19 @@
 Revision history for Lutim
 
+0.9.4  2018-03-11
+	- Replace Twitter account URL with Mastodon one
+
+0.9.3  2018-03-11
+	- Use woff2 format for HennyPenny font
+
+0.9.2  2018-03-09
+	- Fix langage drop-down
+	- Allow to use HTML in broadcast message
+	- Remove old targets from Makefile
+
+0.9.1  2018-03-09
+	- Fix default setting bug (db_path)
+
 0.9.0  2018-03-09
 	- Added partial arabic translation (thx to ButterflyOfFire)
 	- Default theme is now non-fluid (ie don't take all the width of the screen)

Makefile

@@ -31,16 +31,13 @@ test: podcheck test-sqlite test-pg
 clean:
 	rm -rf lutim.db files/
 
-rmassets:
-	rm -rf themes/default/public/packed/*
-
-dev: rmassets
+dev:
 	$(CARTON) morbo $(LUTIM) --listen http://0.0.0.0:3000 --watch lib/ --watch script/ --watch themes/ --watch lutim.conf
 
 devlog:
 	multitail log/development.log
 
-prod: rmassets
+prod:
 	$(CARTON) hypnotoad -f $(LUTIM)
 
 prodlog:

lib/Lutim.pm

@@ -43,6 +43,7 @@ sub startup {
             thumbnail_size    => 100,
             theme             => 'default',
             dbtype            => 'sqlite',
+            db_path           => 'lutim.db',
             max_files_in_zip  => 15,
             prefix            => '/',
             minion            => {

lib/Lutim/Plugin/Lang.pm

@@ -21,8 +21,8 @@ sub _available_langs {
     my $c = shift;
 
     state $langs = Mojo::Collection->new(
-        glob($c->app->home->rel_file('themes/'.$c->config('theme').'/lib/Lutim/I18N/*')),
-        glob($c->app->home->rel_file('themes/default/lib/Lutim/I18N/*'))
+        glob($c->app->home->rel_file('themes/'.$c->config('theme').'/lib/Lutim/I18N/*po')),
+        glob($c->app->home->rel_file('themes/default/lib/Lutim/I18N/*po'))
     )->map(
         sub {
             Mojo::File->new($_)->basename('.po');

lib/Mounter.pm

@@ -38,6 +38,7 @@ sub startup {
                 thumbnail_size    => 100,
                 theme             => 'default',
                 dbtype            => 'sqlite',
+                db_path           => 'lutim.db',
                 max_files_in_zip  => 15,
                 prefix            => '/',
                 minion            => {

themes/default/lib/Lutim/I18N/lutim.pot

@@ -32,11 +32,11 @@ msgstr ""
 msgid "-or-"
 msgstr ""
 
-#: lib/Lutim.pm:186 lib/Lutim/Command/cron/stats.pm:151 lib/Lutim/Command/cron/stats.pm:162 lib/Lutim/Command/cron/stats.pm:179 themes/default/templates/index.html.ep:5 themes/default/templates/raw.html.ep:10 themes/default/templates/raw.html.ep:21 themes/default/templates/raw.html.ep:38
+#: lib/Lutim.pm:187 lib/Lutim/Command/cron/stats.pm:151 lib/Lutim/Command/cron/stats.pm:162 lib/Lutim/Command/cron/stats.pm:179 themes/default/templates/index.html.ep:5 themes/default/templates/raw.html.ep:10 themes/default/templates/raw.html.ep:21 themes/default/templates/raw.html.ep:38
 msgid "1 year"
 msgstr ""
 
-#: lib/Lutim.pm:185 lib/Lutim/Command/cron/stats.pm:148 lib/Lutim/Command/cron/stats.pm:159 lib/Lutim/Command/cron/stats.pm:176 themes/default/templates/index.html.ep:4 themes/default/templates/partial/for_my_delay.html.ep:13 themes/default/templates/partial/lutim.js.ep:151 themes/default/templates/raw.html.ep:18 themes/default/templates/raw.html.ep:35 themes/default/templates/raw.html.ep:7
+#: lib/Lutim.pm:186 lib/Lutim/Command/cron/stats.pm:148 lib/Lutim/Command/cron/stats.pm:159 lib/Lutim/Command/cron/stats.pm:176 themes/default/templates/index.html.ep:4 themes/default/templates/partial/for_my_delay.html.ep:13 themes/default/templates/partial/lutim.js.ep:151 themes/default/templates/raw.html.ep:18 themes/default/templates/raw.html.ep:35 themes/default/templates/raw.html.ep:7
 msgid "24 hours"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 msgid ": Error while trying to get the counter."
 msgstr ""
 
-#: themes/default/templates/partial/navbar.html.ep:75
+#: themes/default/templates/partial/navbar.html.ep:76
 msgid "About"
 msgstr ""
 
@@ -156,7 +156,7 @@ msgstr ""
 msgid "For more details, see the <a href=\"https://framagit.org/luc/lutim\">homepage of the project</a>."
 msgstr ""
 
-#: themes/default/templates/partial/navbar.html.ep:78
+#: themes/default/templates/partial/navbar.html.ep:79
 msgid "Fork me!"
 msgstr ""
 
@@ -200,15 +200,15 @@ msgstr ""
 msgid "Image not found."
 msgstr ""
 
-#: themes/default/templates/partial/navbar.html.ep:67
+#: themes/default/templates/partial/navbar.html.ep:68
 msgid "Informations"
 msgstr ""
 
-#: themes/default/templates/partial/navbar.html.ep:31
+#: themes/default/templates/partial/navbar.html.ep:32
 msgid "Install webapp"
 msgstr ""
 
-#: themes/default/templates/partial/navbar.html.ep:27
+#: themes/default/templates/partial/navbar.html.ep:28
 msgid "Instance's statistics"
 msgstr ""
 
@@ -228,7 +228,7 @@ msgstr ""
 msgid "Keep EXIF tags"
 msgstr ""
 
-#: themes/default/templates/partial/navbar.html.ep:38
+#: themes/default/templates/partial/navbar.html.ep:39
 msgid "Language"
 msgstr ""
 
@@ -236,7 +236,7 @@ msgstr ""
 msgid "Let's go!"
 msgstr ""
 
-#: themes/default/templates/partial/navbar.html.ep:72
+#: themes/default/templates/partial/navbar.html.ep:73
 msgid "License:"
 msgstr ""
 
@@ -260,7 +260,7 @@ msgstr ""
 msgid "Markdown syntax"
 msgstr ""
 
-#: themes/default/templates/myfiles.html.ep:2 themes/default/templates/partial/navbar.html.ep:24
+#: themes/default/templates/myfiles.html.ep:2 themes/default/templates/partial/navbar.html.ep:25
 msgid "My images"
 msgstr ""
 
@@ -318,19 +318,19 @@ msgstr ""
 msgid "Something went wrong when creating the zip file. Try again later or contact the administrator (%1)."
 msgstr ""
 
-#: themes/default/templates/partial/navbar.html.ep:50
+#: themes/default/templates/partial/navbar.html.ep:51
 msgid "Support the author"
 msgstr ""
 
-#: themes/default/templates/partial/navbar.html.ep:58
+#: themes/default/templates/partial/navbar.html.ep:59
 msgid "Support the author on Liberapay"
 msgstr ""
 
-#: themes/default/templates/partial/navbar.html.ep:55
+#: themes/default/templates/partial/navbar.html.ep:56
 msgid "Support the author on Tipeee"
 msgstr ""
 
-#: themes/default/templates/partial/navbar.html.ep:61
+#: themes/default/templates/partial/navbar.html.ep:62
 msgid "Support the author with bitcoins"
 msgstr ""
 
@@ -401,7 +401,7 @@ msgstr ""
 msgid "Toggle fullscreen"
 msgstr ""
 
-#: themes/default/templates/partial/navbar.html.ep:14
+#: themes/default/templates/partial/navbar.html.ep:15
 msgid "Toggle navigation"
 msgstr ""
 
@@ -495,7 +495,7 @@ msgstr ""
 msgid "core developer"
 msgstr ""
 
-#: lib/Lutim.pm:184 lib/Lutim/Command/cron/stats.pm:147 lib/Lutim/Command/cron/stats.pm:158 lib/Lutim/Command/cron/stats.pm:175 themes/default/templates/index.html.ep:3 themes/default/templates/raw.html.ep:17 themes/default/templates/raw.html.ep:34 themes/default/templates/raw.html.ep:6
+#: lib/Lutim.pm:185 lib/Lutim/Command/cron/stats.pm:147 lib/Lutim/Command/cron/stats.pm:158 lib/Lutim/Command/cron/stats.pm:175 themes/default/templates/index.html.ep:3 themes/default/templates/raw.html.ep:17 themes/default/templates/raw.html.ep:34 themes/default/templates/raw.html.ep:6
 msgid "no time limit"
 msgstr ""
 

themes/default/public/css/hennypenny.css

@@ -2,5 +2,6 @@
   font-family: 'Henny_Penny';
   font-style: normal;
   font-weight: 400;
-  src: local('Henny Penny'), local('HennyPenny-Regular'), url(../font/hennypenny.ttf) format('truetype');
+  src: local('Henny Penny'), local('HennyPenny-Regular'), url(../font/hennypenny.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }

themes/default/templates/about.html.ep

@@ -24,7 +24,7 @@
     <p><%== l('For more details, see the <a href="https://framagit.org/luc/lutim">homepage of the project</a>.') %></p>
     <h4><%= l('Main developers') %></h4>
     <ul>
-        <li>Luc Didry, aka Sky (<a href="https://fiat-tux.fr">https://fiat-tux.fr</a>), <%= l('core developer') %>, @framasky <%= l('on') %> <a href="https://framasphere.org/people/b13eb6b0beac0131e7e32a0000053625">Diaspora*</a> <%= l('and on') %> <a href="https://twitter.com/framasky">Twitter</a></li>
+        <li>Luc Didry, aka Sky (<a href="https://fiat-tux.fr">https://fiat-tux.fr</a>), <%= l('core developer') %>, @framasky <%= l('on') %> <a href="https://framasphere.org/people/b13eb6b0beac0131e7e32a0000053625">Diaspora*</a> <%= l('and on') %> <a href="https://framapiaf.org/@framasky">Mastodon</a></li>
         <li>Dattaz (<a href="http://dattaz.fr">http://dattaz.fr</a>), <%= l('webapp developer') %>, <a href="https://twitter.com/dat_taz">@dat_taz</a></li>
     </ul>
     <h4><%= l('Contributors') %></h4>

themes/default/templates/layouts/default.html.ep

@@ -56,7 +56,7 @@
             </div>
 % if (defined(config('broadcast_message'))) {
             <div class="alert alert-info">
-                <strong><%= config('broadcast_message') %></strong>
+                <strong><%== config('broadcast_message') %></strong>
             </div>
 % }
 % if (defined(stash('stop_upload'))) {

themes/default/templates/partial/navbar.html.ep

@@ -1,11 +1,12 @@
 % # vim:set sw=4 ts=4 sts=4 ft=html.epl expandtab:
 % my $l = {
-%     ar => 'العربية',
-%     de => 'Deutsch',
-%     en => 'English',
-%     es => 'Español',
-%     fr => 'Français',
-%     oc => 'Occitan',
+%     ar    => 'العربية',
+%     de    => 'Deutsch',
+%     en    => 'English',
+%     es    => 'Español',
+%     fr    => 'Français',
+%     fr_FR => 'Français (France)',
+%     oc    => 'Occitan',
 % };
 <nav class="navbar navbar-default">
     <div class="container">

zanata.xml

@@ -2,7 +2,9 @@
 <config xmlns="http://zanata.org/namespace/config/">
   <url>https://trad.framasoft.org/zanata/</url>
   <project>lutim</project>
+
   <project-version>master</project-version>
+
   <project-type>gettext</project-type>
   <src-dir>themes/default/lib/Lutim/I18N/</src-dir>
   <trans-dir>themes/default/lib/Lutim/I18N/</trans-dir>