aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mobin21063 -> 21177 bytes
-rw-r--r--locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po7
-rw-r--r--locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mobin26824 -> 26939 bytes
-rw-r--r--locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po7
-rwxr-xr-xthemes/baggy/_head.twig5
-rwxr-xr-xthemes/baggy/config.twig2
-rwxr-xr-xthemes/default/_head.twig30
-rwxr-xr-xthemes/default/config.twig3
8 files changed, 46 insertions, 8 deletions
diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
index 657102e0..2fcb356a 100644
--- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
+++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
Binary files differ
diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
index 89781304..2fe4b352 100644
--- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
+++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
@@ -106,8 +106,11 @@ msgstr "Read the documentation"
106msgid "download the extension" 106msgid "download the extension"
107msgstr "Download the extension" 107msgstr "Download the extension"
108 108
109msgid "Firefox Add-On" 109msgid "Standard Firefox Add-On"
110msgstr "Firefox Add-On" 110msgstr "Standard Firefox Add-On"
111
112msgid "Mozilla Services (Social API) Extension"
113msgstr "Mozilla Services (Social API) Extension"
111 114
112msgid "Chrome Extension" 115msgid "Chrome Extension"
113msgstr "Chrome Extension" 116msgstr "Chrome Extension"
diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
index f393dffe..f46ef600 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
Binary files differ
diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
index 393c200b..f4b87163 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
@@ -200,8 +200,11 @@ msgstr "lisez la documentation"
200msgid "download the extension" 200msgid "download the extension"
201msgstr "téléchargez l'extension" 201msgstr "téléchargez l'extension"
202 202
203msgid "Firefox Add-On" 203msgid "Standard Firefox Add-On"
204msgstr "Add-On Firefox" 204msgstr "Add-On Firefox classique"
205
206msgid "Mozilla Services (Social API) Extension"
207msgstr "Extension Mozilla Services (Social API)"
205 208
206msgid "Chrome Extension" 209msgid "Chrome Extension"
207msgstr "Extension Chrome" 210msgstr "Extension Chrome"
diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig
index 1546a7b9..9ca51cd2 100755
--- a/themes/baggy/_head.twig
+++ b/themes/baggy/_head.twig
@@ -39,6 +39,7 @@
39 <script src="{{ poche_url }}themes/_global/js/popupForm.js"></script> 39 <script src="{{ poche_url }}themes/_global/js/popupForm.js"></script>
40 <script src="{{ poche_url }}themes/_global/js/keyboard.js"></script> 40 <script src="{{ poche_url }}themes/_global/js/keyboard.js"></script>
41 <script src="{{ poche_url }}themes/{{theme}}/js/closeMessage.js"></script> 41 <script src="{{ poche_url }}themes/{{theme}}/js/closeMessage.js"></script>
42
42 <!-- Enable Firefox Social Services 43 <!-- Enable Firefox Social Services
43 script put there because of the call to poche_url --> 44 script put there because of the call to poche_url -->
44 45
@@ -56,9 +57,9 @@
56 57
57 "description": "wallabag Extension for Firefox - The (soon to become) best way to save articles, videos and more", 58 "description": "wallabag Extension for Firefox - The (soon to become) best way to save articles, videos and more",
58 "author": "Thomas Citharel", 59 "author": "Thomas Citharel",
59 "homepageURL": "https://wallabag.org", 60 "homepageURL": "http://doc.wallabag.org/en/User/save_your_first_article.html#firefox-social-api-service",
60 "origin": "https://wallabag.org", 61 "origin": "https://wallabag.org",
61 "postActivationURL": "https://wallabag.org", 62 "postActivationURL": "http://doc.wallabag.org/en/User/save_your_first_article.html#firefox-social-api-service",
62 63
63 "version": "0.1" 64 "version": "0.1"
64 }; 65 };
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index 8562f133..2e40178e 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -17,7 +17,7 @@
17 <h3>{% trans "Browser Addons" %}</h3> 17 <h3>{% trans "Browser Addons" %}</h3>
18 <ul> 18 <ul>
19 <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans "Standard Firefox Add-On" %}</a></li> 19 <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans "Standard Firefox Add-On" %}</a></li>
20 <li><button onclick="activateSocialFeature(this)">Mozilla Services Social API Extension</button> 20 <li><button onclick="activateSocialFeature(this)">{% trans "Mozilla Services (Social API) Extension" %}</button></li>
21 <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans "Chrome Extension" %}</a></li> 21 <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans "Chrome Extension" %}</a></li>
22 </ul> 22 </ul>
23 <h3>{% trans "Mobile Apps" %}</h3> 23 <h3>{% trans "Mobile Apps" %}</h3>
diff --git a/themes/default/_head.twig b/themes/default/_head.twig
index ce1bbdcc..e3841c77 100755
--- a/themes/default/_head.twig
+++ b/themes/default/_head.twig
@@ -36,3 +36,33 @@
36 <script src="{{ poche_url }}themes/_global/js/saveLink.js"></script> 36 <script src="{{ poche_url }}themes/_global/js/saveLink.js"></script>
37 <script src="{{ poche_url }}themes/_global/js/keyboard.js"></script> 37 <script src="{{ poche_url }}themes/_global/js/keyboard.js"></script>
38 <script src="{{ poche_url }}themes/_global/js/popupForm.js"></script> 38 <script src="{{ poche_url }}themes/_global/js/popupForm.js"></script>
39
40 <!-- Enable Firefox Social Services
41 script put there because of the call to poche_url -->
42
43 <script>
44 var baseurl = "{{ poche_url }}";
45 console.log(baseurl);
46 var data = {
47
48 "name": "wallabag",
49 "iconURL": baseurl + "/themes/_global/img/appicon/firefox-service-icon-16.png",
50 "icon32URL": baseurl + "/themes/_global/img/appicon/firefox-service-icon-32.png",
51 "icon64URL": baseurl + "/themes/_global/img/appicon/firefox-service-icon-64.png",
52
53 "shareURL": baseurl + "/index.php?action=add&plainurl=%{url}",
54
55 "description": "wallabag Extension for Firefox - The (soon to become) best way to save articles, videos and more",
56 "author": "Thomas Citharel",
57 "homepageURL": "http://doc.wallabag.org/en/User/save_your_first_article.html#firefox-social-api-service",
58 "origin": "https://wallabag.org",
59 "postActivationURL": "http://doc.wallabag.org/en/User/save_your_first_article.html#firefox-social-api-service",
60
61 "version": "0.1"
62 };
63 function activateSocialFeature(node) {
64 var event = new CustomEvent("ActivateSocialFeature");
65 node.setAttribute("data-service", JSON.stringify(data));
66 node.dispatchEvent(event);
67 }
68 </script> \ No newline at end of file
diff --git a/themes/default/config.twig b/themes/default/config.twig
index 09e40e75..e39826c3 100755
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -16,7 +16,8 @@
16 </p> 16 </p>
17 <h3>Browser Plugins</h3> 17 <h3>Browser Plugins</h3>
18 <ul> 18 <ul>
19 <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans "Firefox Add-On" %}</a></li> 19 <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans "Standard Firefox Add-On" %}</a></li>
20 <li><button onclick="activateSocialFeature(this)">{% trans "Mozilla Services (Social API) Extension" %}</button></li>
20 <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans "Chrome Extension" %}</a></li> 21 <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans "Chrome Extension" %}</a></li>
21 </ul> 22 </ul>
22 <h3>Mobile Apps</h3> 23 <h3>Mobile Apps</h3>