]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge pull request #2016 from wallabag/update-documentation
authorJeremy Benoist <j0k3r@users.noreply.github.com>
Sat, 7 May 2016 09:10:21 +0000 (11:10 +0200)
committerJeremy Benoist <j0k3r@users.noreply.github.com>
Sat, 7 May 2016 09:10:21 +0000 (11:10 +0200)
Update documentation

24 files changed:
README.md
app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml [new file with mode: 0644]
app/config/config.yml
docs/en/index.rst
docs/en/user/android.rst [new file with mode: 0644]
docs/img/user/android_configuration_connection_test.de.png [new file with mode: 0644]
docs/img/user/android_configuration_connection_test_success.de.png [new file with mode: 0644]
docs/img/user/android_configuration_feed_credentials_automatically_filled_in.de.png [new file with mode: 0644]
docs/img/user/android_configuration_filled_in.de.png [new file with mode: 0644]
docs/img/user/android_configuration_get_feed_credentials.de.png [new file with mode: 0644]
docs/img/user/android_configuration_saved_feed_update.de.png [new file with mode: 0644]
docs/img/user/android_configuration_screen.de.png [new file with mode: 0644]
docs/img/user/android_configuration_scroll_bottom.de.png [new file with mode: 0644]
docs/img/user/android_unread_feed_synced.de.png [new file with mode: 0644]
docs/img/user/android_welcome_screen.de.png [new file with mode: 0644]
src/Wallabag/CoreBundle/Entity/Tag.php
src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css
src/Wallabag/CoreBundle/Resources/translations/messages.it.yml [new file with mode: 0644]
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig [new file with mode: 0644]
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/pager.html.twig [new file with mode: 0644]
src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig

index 244fc3f9fe497d3aa762c6f61eaf86fd12fcb732..cad6ddf3dc4f5b892ebf6ed136213d8deb7568f8 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-[![Build Status](https://travis-ci.org/wallabag/wallabag.svg?branch=v2)](https://travis-ci.org/wallabag/wallabag)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/quality-score.png?b=v2)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=v2)
+[![Build Status](https://api.travis-ci.org/wallabag/wallabag.svg?branch=master)](https://travis-ci.org/wallabag/wallabag)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=v2)
 [![Gitter](https://badges.gitter.im/gitterHQ/gitter.svg)](https://gitter.im/wallabag/wallabag)
 
 # What is wallabag?
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
new file mode 100644 (file)
index 0000000..ec30290
--- /dev/null
@@ -0,0 +1,29 @@
+download_pictures: Scarica le immagini sul tuo server
+carrot: Abilita la condivisione su Carrot
+diaspora_url: Diaspora URL, se il servizio è abilitato
+export_epub: Abilita esportazione ePub
+export_mobi: Abilita esportazione .mobi
+export_pdf: Abilita esportazione PDF
+export_csv: Abilita esportazione CSV
+export_json: Abilita esportazione JSON
+export_txt: Abilita esportazione TXT
+export_xml: Abilita esportazione XML
+pocket_consumer_key: Consumer key per Pocket per importare i contenuti (https://getpocket.com/developer/docs/authentication)
+shaarli_url: Shaarli URL, if the service is enabled
+share_diaspora: Abilita la condivisione su Diaspora
+share_mail: Abilita la condivisione per email
+share_shaarli: Abilita la condivisione su Shaarli
+share_twitter: Abilita la condivisione su Twitter
+show_printlink: Mostra un collegamento per stampare il contenuto
+wallabag_support_url: URL di supporto per wallabag
+wallabag_url: URL della *tua* installazione di wallabag
+entry: "articolo"
+export: "esporta"
+import: "importa"
+misc: "misc"
+modify_settings: "applica"
+piwik_host: Host del tuo sito in Piwik
+piwik_site_id: ID del tuo sito in Piwik
+piwik_enabled: Abilita Piwik
+demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
+demo_mode_username: "Utente Demo"
index 9bc2661a155772cb5dd0b6a1d60bd776fdab7136..4d5ea38642eb5f1b3e23699b14ffb3ed0a5b8c6c 100644 (file)
@@ -41,6 +41,7 @@ wallabag_core:
         da: 'Dansk'
         es: 'Español'
         oc: 'Occitan'
+        it: 'Italiano'
     items_on_page: 12
     theme: material
     language: en
index 74e09f1afa57195121da7a81aea8075e139aedb7..03025ef9247bb9015706b2b7c12401f8188bbd9f 100644 (file)
@@ -37,6 +37,7 @@ The main documentation for this application is organized into a couple sections:
    user/download_articles
    user/filters
    user/tags
+   user/android
 
 .. _dev-docs:
 
diff --git a/docs/en/user/android.rst b/docs/en/user/android.rst
new file mode 100644 (file)
index 0000000..c13cf03
--- /dev/null
@@ -0,0 +1,107 @@
+Android App
+===========
+
+
+Purpose of this document
+------------------------
+
+This document describes how you can setup your Android application to work with your wallabag instance. There is no difference in this procedure for wallabag v1 or v2.
+
+
+Steps to configure your app
+---------------------------
+
+When you first start the app, you see the welcome screen, where you are adviced to configure the app for your wallabag instance at first.
+
+.. image:: ../../img/user/android_welcome_screen.de.png
+    :alt: Welcome screen
+    :align: center
+
+Just confirm that message and you get redirected to the settings screen.
+
+.. image:: ../../img/user/android_configuration_screen.de.png
+    :alt: Settings screen
+    :align: center
+
+Fill in your wallabag data. You need to enter your wallabag address. It is important that this URL does not end with a slash. Also add your wallabag credentials to the user name and password field.
+
+.. image:: ../../img/user/android_configuration_filled_in.de.png
+    :alt: Filled in settings
+    :align: center
+
+After you have filled in your data, push the button Connection test and wait for the test to finish. 
+
+.. image:: ../../img/user/android_configuration_connection_test.de.png
+    :alt: Connection test with your wallabag data
+    :align: center
+
+The connection test shall finish with success. If not, you need to fix this first until you proceed. 
+
+.. image:: ../../img/user/android_configuration_connection_test_success.de.png
+    :alt: Connection test successful
+    :align: center
+
+After the connection test was successful, you can push the button to get your feed credentials. The app now tries to login to your wallabag instance and get the user id and the corresponding token for the feeds.
+
+.. image:: ../../img/user/android_configuration_get_feed_credentials.de.png
+    :alt: Getting the feed credentials
+    :align: center
+
+When the process of getting your feed credentials finishes with success you see a toast message that the user id and the token were automatically filled in to the form.
+
+.. image:: ../../img/user/android_configuration_feed_credentials_automatically_filled_in.de.png
+    :alt: Getting feed credentials successful
+    :align: center
+
+Now you need to scroll to the bottom of the settings menu. Of course you can adjust the given settings to your needs. Finish the configuration of your app with pushing the save button.
+
+.. image:: ../../img/user/android_configuration_scroll_bottom.de.png
+    :alt: Bottom of the settings screen
+    :align: center
+
+After hitting the save button, you get the following screen. The app proposes to initiate a syncronisation process to update your feeds of articles. It is recommended to acknowledge this action and press Yes.
+
+.. image:: ../../img/user/android_configuration_saved_feed_update.de.png
+    :alt: Settings saved the first time
+    :align: center
+
+Finally after the syncronisation finished successfully, you are presented the list of unread articles. 
+
+.. image:: ../../img/user/android_unread_feed_synced.de.png
+    :alt: Filled article list cause feeds successfully syncronized
+    :align: center
+
+
+
+Known limitations
+----
+
+2FA
+~~~
+
+Currently the does not support two-factor authentication. You should disable that to get the app working.
+
+
+Limited amount of articles with wallabag v2
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In your wallabag web instance you can configure how many items are part of the RSS feed. This option did not exist in wallabag v1, where all articles were part of the feed. So if you set the amount of articles being displayed greater than the number of items being content of your RSS feed, you will only see the number of items in your RSS feed. 
+
+
+SSL/TLS encryption
+~~~~~~~~~~~~~~~~~~
+
+If you can reach your wallabag web instance via HTTPS, you should use that. Especially if your HTTP URL redirects you to the HTTPS one. Currently, the app cannot handle that redirect properly.
+
+
+References
+----------
+
+`Source code of the Android application <https://github.com/wallabag/android-app>`_
+
+`Android Application on F-Droid <https://f-droid.org/repository/browse/?fdfilter=wallabag&fdid=fr.gaulupeau.apps.InThePoche>`_
+
+`Android Application on Google Play <https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche>`_
+
+`Support chat <https://gitter.im/wallabag/wallabag>`_
+
diff --git a/docs/img/user/android_configuration_connection_test.de.png b/docs/img/user/android_configuration_connection_test.de.png
new file mode 100644 (file)
index 0000000..63394f8
Binary files /dev/null and b/docs/img/user/android_configuration_connection_test.de.png differ
diff --git a/docs/img/user/android_configuration_connection_test_success.de.png b/docs/img/user/android_configuration_connection_test_success.de.png
new file mode 100644 (file)
index 0000000..f5c1971
Binary files /dev/null and b/docs/img/user/android_configuration_connection_test_success.de.png differ
diff --git a/docs/img/user/android_configuration_feed_credentials_automatically_filled_in.de.png b/docs/img/user/android_configuration_feed_credentials_automatically_filled_in.de.png
new file mode 100644 (file)
index 0000000..a191a6e
Binary files /dev/null and b/docs/img/user/android_configuration_feed_credentials_automatically_filled_in.de.png differ
diff --git a/docs/img/user/android_configuration_filled_in.de.png b/docs/img/user/android_configuration_filled_in.de.png
new file mode 100644 (file)
index 0000000..4cd8d70
Binary files /dev/null and b/docs/img/user/android_configuration_filled_in.de.png differ
diff --git a/docs/img/user/android_configuration_get_feed_credentials.de.png b/docs/img/user/android_configuration_get_feed_credentials.de.png
new file mode 100644 (file)
index 0000000..1c401cb
Binary files /dev/null and b/docs/img/user/android_configuration_get_feed_credentials.de.png differ
diff --git a/docs/img/user/android_configuration_saved_feed_update.de.png b/docs/img/user/android_configuration_saved_feed_update.de.png
new file mode 100644 (file)
index 0000000..2af4102
Binary files /dev/null and b/docs/img/user/android_configuration_saved_feed_update.de.png differ
diff --git a/docs/img/user/android_configuration_screen.de.png b/docs/img/user/android_configuration_screen.de.png
new file mode 100644 (file)
index 0000000..7bf7218
Binary files /dev/null and b/docs/img/user/android_configuration_screen.de.png differ
diff --git a/docs/img/user/android_configuration_scroll_bottom.de.png b/docs/img/user/android_configuration_scroll_bottom.de.png
new file mode 100644 (file)
index 0000000..8210832
Binary files /dev/null and b/docs/img/user/android_configuration_scroll_bottom.de.png differ
diff --git a/docs/img/user/android_unread_feed_synced.de.png b/docs/img/user/android_unread_feed_synced.de.png
new file mode 100644 (file)
index 0000000..a3b6ed0
Binary files /dev/null and b/docs/img/user/android_unread_feed_synced.de.png differ
diff --git a/docs/img/user/android_welcome_screen.de.png b/docs/img/user/android_welcome_screen.de.png
new file mode 100644 (file)
index 0000000..4d3543d
Binary files /dev/null and b/docs/img/user/android_welcome_screen.de.png differ
index a6e2d023b8b008ef14da4ac396a917adab1f8820..b4adbbd3eeffdb1e5ee774aa0027cac3d91475e2 100644 (file)
@@ -117,4 +117,16 @@ class Tag
     {
         return $this->entries;
     }
+
+    public function getEntriesByUserId($userId)
+    {
+        $filteredEntries = new ArrayCollection();
+        foreach ($this->entries as $entry) {
+            if ($entry->getUser()->getId() === $userId) {
+                $filteredEntries->add($entry);
+            }
+        }
+
+        return $filteredEntries;
+    }
 }
index a3915b1d90dc2490f024bae14d56783082a69bba..b106d91a3b807e6a2e325271623fa0924f6911d7 100755 (executable)
@@ -437,6 +437,9 @@ main ul.row {
     .indicator {
         display: none;
     }
+    .pagination li.prev, .pagination li.next {
+        width: auto;
+    }
   }
 
 @media only screen and (min-width : 400px) {
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
new file mode 100644 (file)
index 0000000..ae30fce
--- /dev/null
@@ -0,0 +1,425 @@
+security:
+    login:
+        page_title: 'Benvenuto in wallabag!'
+        keep_logged_in: 'Resta loggato'
+        forgot_password: 'Hai dimenticato la password?'
+        submit: 'Login'
+        register: 'Registrati'
+        username: 'Username'
+        password: 'Password'
+        cancel: 'Cancella'
+    resetting:
+        description: "Inserisci il tuo indirizzo e-mail nel campo sottostante e ti invieremo le istruzioni per il reset della password."
+    register:
+        page_title: 'Crea un account'
+        go_to_account: 'Vai al tuo account'
+
+menu:
+    left:
+        unread: 'Non letti'
+        starred: 'Preferiti'
+        archive: 'Archivio'
+        all_articles: 'Tutti'
+        config: 'Configurazione'
+        tags: 'Tags'
+        internal_settings: 'Strumenti'
+        import: 'Importa'
+        howto: 'How to'
+        developer: 'Sviluppatori'
+        logout: 'Logout'
+        about: 'About'
+        search: 'Cerca'
+        save_link: 'Salva collegamento'
+        back_to_unread: 'Torna ai contenuti non letti'
+    top:
+        add_new_entry: 'Aggiungi un nuovo contenuto'
+        search: 'Cerca'
+        filter_entries: 'Filtra contenuti'
+        export: 'Esporta'
+    search_form:
+        input_label: 'Inserisci qui la tua ricerca'
+
+footer:
+    wallabag:
+        elsewhere: 'Porta wallabag con te'
+        social: 'Social'
+        powered_by: 'powered by'
+        about: 'About'
+
+config:
+    page_title: 'Configurazione'
+    tab_menu:
+        settings: 'Impostazioni'
+        rss: 'RSS'
+        user_info: 'Informazioni utente'
+        password: 'Password'
+        rules: 'Regole di tagging'
+        new_user: 'Aggiungi utente'
+    form:
+        save: 'Salva'
+    form_settings:
+        theme_label: 'Tema'
+        items_per_page_label: 'Elementi per pagina'
+        language_label: 'Lingua'
+        reading_speed:
+            label: 'Velocità di lettura'
+            help_message: 'Puoi utilizzare dei tools online per valutare la tua velocità di lettura:'
+            100_word: 'Leggo ~100 parole al minuto'
+            200_word: 'Leggo ~200 parole al minuto'
+            300_word: 'Leggo ~300 parole al minuto'
+            400_word: 'Leggo ~400 parole al minuto'
+    form_rss:
+        description: 'I feed RSS generati da wallabag ti permettono di leggere i tuoi contenuti salvati con il tuo lettore di RSS preferito. Prima, devi generare un token.'
+        token_label: 'RSS token'
+        no_token: 'Nessun token'
+        token_create: 'Crea il tuo token'
+        token_reset: 'Rigenera il tuo token'
+        rss_links: 'Collegamenti RSS'
+        rss_link:
+            unread: 'non letti'
+            starred: 'preferiti'
+            archive: 'archiviati'
+        rss_limit: 'Numero di elementi nel feed'
+    form_user:
+        two_factor_description: "Abilitando la two factor authentication riceverai una e-mail con un codice per ogni nuova connesione non verificata"
+        name_label: 'Nome'
+        email_label: 'E-mail'
+        twoFactorAuthentication_label: 'Two factor authentication'
+    form_password:
+        old_password_label: 'Password corrente'
+        new_password_label: 'Nuova password'
+        repeat_new_password_label: 'Ripeti la nuova password'
+    form_rules:
+        if_label: 'se'
+        then_tag_as_label: 'allora tagga come'
+        delete_rule_label: 'elimina'
+        rule_label: 'Regola'
+        tags_label: 'Tag'
+        faq:
+            title: 'FAQ'
+            tagging_rules_definition_title: 'Cosa significa « regole di tagging » ?'
+            tagging_rules_definition_description: 'Sono regole utilizzate da wallabag per taggare automaticamente i contenuti.<br />Ogni volta che viene aggiunto un contenuto, tutte le regole di tagging rules vengono utilizzate per aggiungere i tag configurati, risparmiandoti il lavoro di classificare i contenuti manualmente.'
+            how_to_use_them_title: 'Come si usano?'
+            how_to_use_them_description: 'Diciamo che vuoi taggare un contenuto come « <i>lettura veloce</i> » quando il tempo di lettura è inferiore ai 3 minuti.<br />In questo case, devi mettere « readingTime &lt;= 3 » nel campo <i>Regola</i> e « <i>lettura veloce</i> » nel campo <i>Tag</i>.<br />Molti tag si possono aggiungere contemporanemente separandoli con una virgola: « <i>lettura veloce, da leggere</i> »<br />Regole complesse possono essere scritte utilizzando gli operatori predefiniti: se « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » allora tagga « <i>lettura lunga, github </i> »'
+            variables_available_title: 'Quali operatori e variabili posso utilizzare per scrivere delle regole?'
+            variables_available_description: 'I seguenti operatori e variabili posso essere utilizzati per scrivere regole di tagging:'
+            meaning: 'Significato'
+            variable_description:
+                label: 'Variabile'
+                title: "Titolo del contenuto"
+                url: "URL del contenuto"
+                isArchived: "Specifica se il contenuto è archiviato o no"
+                isStarred: "Specifica se il contenuto è preferito o no"
+                content: "La pagina del contenuto"
+                language: "La lingua del contenuto"
+                mimetype: "Mime-type del contenuto"
+                readingTime: "Il tempo di lettura stimato del contenuto, in minuti"
+                domainName: "Il nome di dominio del contenuto"
+            operator_description:
+                label: 'Operatore'
+                less_than: 'Minore/uguale di...'
+                strictly_less_than: 'Minore di...'
+                greater_than: 'Maggiore/uguale di...'
+                strictly_greater_than: 'Maggiore di...'
+                equal_to: 'Uguale a...'
+                not_equal_to: 'Non uguale a...'
+                or: "Una regola O un'altra"
+                and: "Una regola E un'altra"
+                matches: 'Verifica che un <i>oggetto</i> risulti in una <i>ricerca</i> (case-insensitive).<br />Esempio: <code>titolo contiene "football"</code>'
+    form_new_user:
+        username_label: 'Username'
+        password_label: 'Password'
+        repeat_new_password_label: 'Ripeti password'
+        plain_password_label: '????'
+        email_label: 'E-mail'
+
+entry:
+    page_titles:
+        unread: 'Contenuti non letti'
+        starred: 'Contenuti preferiti'
+        archived: 'Contenuti archiviati'
+        filtered: 'Contenuti filtrati'
+    list:
+        number_on_the_page: "{0} Non ci sono contenuti.|{1} C'è un contenuto.|]1,Inf[ Ci sono %count% contenuti."
+        reading_time: 'tempo di lettura stimato'
+        reading_time_minutes: 'tempo di lettura stimato: %readingTime% min'
+        reading_time_less_one_minute: 'tempo di lettura stimato: <small class="inferieur">&lt;</small> 1 min'
+        original_article: 'originale'
+        toogle_as_read: 'Segna come da leggere'
+        toogle_as_star: 'Segna come non preferito'
+        delete: 'Elimina'
+        export_title: 'Esporta'
+    filters:
+        title: 'Filtri'
+        status_label: 'Stato'
+        archived_label: 'Archiviati'
+        starred_label: 'Preferiti'
+        preview_picture_label: "Ha un'immagine di anteprima"
+        preview_picture_help: 'Immagine di anteprima'
+        language_label: 'Lingua'
+        reading_time:
+            label: 'Tempo di lettura in minuti'
+            from: 'da'
+            to: 'a'
+        domain_label: 'Nome di dominio'
+        created_at:
+            label: 'Data di creazione'
+            from: 'da'
+            to: 'a'
+        action:
+            clear: 'Pulisci'
+            filter: 'Filtra'
+    view:
+        left_menu:
+            back_to_top: "Torna all'inizio"
+            back_to_homepage: 'Indietro'
+            set_as_read: 'Segna come già letto'
+            set_as_unread: 'Segna come da leggere'
+            set_as_favorite: 'Segna come preferito'
+            view_original_article: 'Contenuto originale'
+            re_fetch_content: 'Ri-ottieni pagina'
+            delete: 'Elimina'
+            add_a_tag: 'Aggiungi un tag'
+            share_content: 'Condividi'
+            share_email_label: 'E-mail'
+            download: 'Download'
+            print: 'Stampa'
+            problem:
+                label: 'Problemi?'
+                description: 'Questo contenuto viene visualizzato male?'
+        edit_title: 'Modifica titolo'
+        original_article: 'originale'
+        annotations_on_the_entry: '{0} Nessuna annotazione|{1} Una annotazione|]1,Inf[ %nbAnnotations% annotazioni'
+    new:
+        page_title: 'Salva un nuovo contenuto'
+        placeholder: 'http://website.com'
+        form_new:
+            url_label: Url
+    edit:
+        page_title: 'Modifica voce'
+        title_label: 'Titolo'
+        url_label: 'Url'
+        is_public_label: 'Pubblico'
+        save_label: 'Salva'
+
+about:
+    page_title: 'About'
+    top_menu:
+        who_behind_wallabag: "Chi c'è dietro a wallabag"
+        getting_help: 'Ottieni aiuto'
+        helping: 'Aiuta wallabag'
+        contributors: 'Collaboratori'
+        third_party: 'Librerie di terze parti'
+    who_behind_wallabag:
+        developped_by: 'Sviluppato da'
+        website: 'sito web'
+        many_contributors: 'E molti altri collaboratori ♥ <a href="https://github.com/wallabag/wallabag/graphs/contributors">su Github</a>'
+        project_website: 'Sito web del progetto'
+        license: 'Licenza'
+        version: 'Versione'
+    getting_help:
+        documentation: 'Documentazione'
+        bug_reports: 'Bug reports'
+        support: '<a href="https://support.wallabag.org">Sul nostro sito di supporto</a> o <a href="https://github.com/wallabag/wallabag/issues">su GitHub</a>'
+    helping:
+        description: 'wallabag è gratuito opensource. Puoi aiutarci:'
+        by_contributing: 'per contribuire al progetto:'
+        by_contributing_2: 'un elenco delle attività richieste'
+        by_paypal: 'via Paypal'
+    contributors:
+        description: 'Un grazie ai collaboratori di wallabag web application'
+    third_party:
+        description: 'Ecco un elenco delle librerie di terze parti utilizzate in wallabag (con le rispettive licenze):'
+        package: 'Package'
+        license: 'Licenza'
+
+howto:
+    page_title: 'How to'
+    page_description: 'Ci sono diversi modi per salvare un contenuto:'
+    top_menu:
+        browser_addons: 'tramite addons del Browser'
+        mobile_apps: 'tramite app Mobile'
+        bookmarklet: 'tramite Bookmarklet'
+    form:
+        description: 'Tramite questo modulo'
+    browser_addons:
+        firefox: 'Add-On di Firefox'
+        chrome: 'Estensione di Chrome'
+    mobile_apps:
+        android:
+            via_f_droid: 'via F-Droid'
+            via_google_play: 'via Google Play'
+        ios: 'sullo store di iTunes'
+        windows: 'sullo store di Microsoft'
+    bookmarklet:
+        description: 'Trascinando e rilasciando questo link sulla barra dei bookmark del tuo browser:'
+
+quickstart:
+    page_title: 'Introduzione'
+    intro:
+        title: 'Benvenuto su wallabag!'
+        paragraph_1: "Un tour in cui ti guideremo per scoprire e che ti mostrerà delle funzionalità che potrebbero interessarti."
+        paragraph_2: 'Seguici!'
+    configure:
+        title: "Configura l'applicazione"
+        language: 'Cambia lingua e design'
+        rss: 'Abilita i feed RSS'
+        tagging_rules: 'Scrivi delle regole per taggare automaticamente i contenuti'
+    admin:
+        title: 'Amministrazione'
+        description: 'Come amministratore, hai la possibilità di svolgere le seguenti operazioni in wallabag:'
+        new_user: 'Crea un nuovo account'
+        analytics: 'Configura analytics'
+        sharing: 'Abilita alcuni parametri riguardo il salvataggio dei contenuti'
+        export: "Configura l'esportazione"
+        import: "Configura l'importazione"
+    first_steps:
+        title: 'Pimi passi'
+        new_article: 'Salva il tuo primo contenuto'
+        unread_articles: 'E classificalo!'
+    migrate:
+        title: 'Trasferimento da un servizio esistente'
+        description: "Stai utilizzando un altro servizio? Ti aiutiamo a traferire i tuoi dati su wallabag."
+        pocket: 'Trasferisci da Pocket'
+        wallabag_v1: 'Trasferisci da wallabag v1'
+        wallabag_v2: 'Trasferisci da wallabag v2'
+    developer:
+        title: 'Sviluppatori'
+        create_application: 'Crea la tua applicazione'
+    docs:
+        title: 'Documentazione completa'
+        annotate: 'Annota il tuo contenuto'
+        export: 'Converti i tuoi contenuti in EPUB o PDF'
+        search_filters: 'Impara come puoi recuperare un contenuto tramite la ricerca e i filtri'
+        fetching_errors: 'Cosa posso fare se riscontro problemi nel recupero di un contenuto?'
+        all_docs: 'E molta altra documentazione!'
+    support:
+        title: 'Supporto'
+        description: 'Se hai bisogno di aiuto, siamo qui per te.'
+        github: 'Su GitHub'
+        email: 'Per email'
+        gitter: 'Su Gitter'
+
+tag:
+    page_title: 'Tags'
+    list:
+        number_on_the_page: "{0} Non ci sono tag.|{1} C'è un tag.|]1,Inf[ ci sono %count% tag."
+
+import:
+    page_title: 'Importa'
+    page_description: "Benvenuto nell'importatore di wallabag. Seleziona il servizio da cui vuoi trasferire i contenuti."
+    action:
+        import_contents: 'Importa contenuti'
+    form:
+        mark_as_read_title: 'Segna tutto come già letto?'
+        mark_as_read_label: 'Segna tutti i contenuti importati come letti'
+        file_label: 'File'
+        save_label: 'Carica file'
+    pocket:
+        page_title: 'Importa da > Pocket'
+        description: "Questo importatore copierà tutti i tuoi dati da Pocket. Pocket non ci consente di ottenere contenuti dal loro servzio, così il contenuto leggibile di ogni articolo verrà ri-ottenuto da wallabag."
+        config_missing:
+            description: "Importazione da Pocket non configurata."
+            admin_message: 'Devi definire %keyurls% una pocket_consumer_key %keyurle%.'
+            user_message: 'Il tuo amministratore di server deve define una API Key per Pocket.'
+        authorize_message: 'Puoi importare dati dal tuo account Pocket. Devi solo cliccare sul pulsante sottostante e autorizzare la connessione a getpocket.com.'
+        connect_to_pocket: 'Connetti a Pocket and importa i dati'
+    wallabag_v1:
+        page_title: 'Importa da > Wallabag v1'
+        description: 'Questo importatore copierà tutti i tuoi dati da un wallabag v1. Nella tua pagina di configurazione, clicca su "JSON export" nella sezione "Esport i tuoi dati di wallabag". Otterrai un file "wallabag-export-1-xxxx-xx-xx.json".'
+        how_to: 'Seleziona la tua esportazione di wallabag e clicca sul pulsante sottostante caricare il file e importare i dati.'
+    wallabag_v2:
+        page_title: 'Importa da > Wallabag v2'
+        description: 'Questo importatore copierà tutti i tuoi dati da un wallabag v2. Vai in "Tutti i contenuti", e, nella sidebar di esportazione, clicca su "JSON". Otterrai un file "Tutti i contenuti.json".'
+
+developer:
+    page_title: 'Sviluppatori'
+    welcome_message: 'Benvenuto nelle API di wallabag'
+    documentation: 'Documentazione'
+    how_to_first_app: 'Come creare la mia prima applicazione'
+    full_documentation: 'Consulta la documentazione API completa'
+    list_methods: 'Elenco dei metodi API'
+    clients:
+        title: 'Client'
+        create_new: 'Crea un nuovo client'
+    existing_clients:
+        title: 'Client esistenti'
+        field_id: 'Client ID'
+        field_secret: 'Client secret'
+        field_uris: 'Redirect URI'
+        field_grant_types: 'Tipi di grant permessi'
+        no_client: 'Ancora nessun client.'
+    remove:
+        warn_message_1: "Hai la possibilitò di rimuovere questo client.L'operazione è IRREVERSIBILE!"
+        warn_message_2: "Se lo rimuovi, ogni app configurata con questo client non sarà più in grado di autenticarsi."
+        action: 'Rimuovi questo client'
+    client:
+        page_title: 'Sviluppatori > Nuovo client'
+        page_description: 'Stai per creare un nuovo client. Compila i campi sottostanti per il redirect URI della tua applicazione.'
+        form:
+            redirect_uris_label: 'Redirect URI'
+            save_label: 'Crea un nuovo client'
+        action_back: 'Indietro'
+    client_parameter:
+        page_title: 'Sviluppatori > parametri Client'
+        page_description: 'Questi sono i tuoi parametri del client.'
+        field_id: 'Client ID'
+        field_secret: 'Client secret'
+        back: 'Indietro'
+        read_howto: 'Leggi howto "Come creare la mia prima applicazione"'
+    howto:
+        page_title: 'Sviluppatori > Come creare la mia prima applicazione'
+        description:
+            paragraph_1: 'I seguenti comandi fanno uso della <a href="https://github.com/jkbrzt/httpie">libreria HTTPie</a>. Verifica che sia installata sul tuo sistema prima di utilizzarli.'
+            paragraph_2: 'Hai bisogno di un token per far comunicare la tua applicazione di terze parti e le API di wallabag.'
+            paragraph_3: 'Per creare questo token, hai bisogno di <a href="%link%">creare un nuovo client</a>.'
+            paragraph_4: 'Ora, crea il tuo token (sostituisci client_id, client_secret, username e password con valori reali):'
+            paragraph_5: 'Le API ritorneranno una risposta di questo tipo:'
+            paragraph_6: "L'access_token è utile per chiamare un API endpoint. Per esempio:"
+            paragraph_7: 'Questa chiamata ritornerà tutti i contenuti per il tuo utente.'
+            paragraph_8: 'Se vuoi visualizzare tutti gli API endpoints, dai una occhiata alla <a href="%link%">documentazione delle API</a>.'
+        back: 'Indietro'
+
+validator:
+    password_must_match: 'Le password devono corrispondere.'
+    password_too_short: 'La password deve essere lunga almeno 8 caratteri'
+    password_wrong_value: 'Valore inserito per la password corrente errato'
+    item_per_page_too_high: 'Questo valore è troppo alto'
+    rss_limit_too_hight: 'Questo valore è troppo alto'
+
+flashes:
+    config:
+        notice:
+            config_saved: 'Configurazione salvata. Alcuni parametri verranno utilizzati dopo il logout/login.'
+            password_updated: 'Password aggiornata'
+            password_not_updated_demo: "In modalità demo, non puoi cambiare la password dell'utente."
+            user_updated: 'Informazioni aggiornate'
+            rss_updated: 'Informazioni RSS aggiornate'
+            tagging_rules_updated: 'Regole di tagging aggiornate'
+            tagging_rules_deleted: 'Regola di tagging aggiornate'
+            user_added: 'Utente "%username%" aggiunto'
+            rss_token_updated: 'RSS token aggiornato'
+    entry:
+        notice:
+            entry_already_saved: 'Contenuto già salvato in data %date%'
+            entry_saved: 'Contenuto salvato'
+            entry_updated: 'Contenuto aggiornato'
+            entry_reloaded: 'Contenuto ricaricato'
+            entry_reload_failed: 'Errore nel ricaricamento del contenuto'
+            entry_archived: 'Contenuto archiviato'
+            entry_unarchived: 'Contenuto dis-archiviato'
+            entry_starred: 'Contenuto segnato come preferito'
+            entry_unstarred: 'Contenuto rimosso dai preferiti'
+            entry_deleted: 'Contenuto eliminato'
+    tag:
+        notice:
+            tag_added: 'Tag aggiunto'
+    import:
+        notice:
+            failed: 'Importazione fallita, riprova.'
+            failed_on_file: 'Errore durante la processazione dei dati da importare. Verifica il tuo file di import.'
+            summary: 'Sommario di importazione: %imported% importati, %skipped% già salvati.'
+    developer:
+        notice:
+            client_created: 'Nuovo client creato.'
+            client_deleted: 'Client eliminato'
index c093edcb4fbd11c80300924996eb4742c51b71d5..a2caaebf80a9e5c4fcf51db7afcf0087f9614c2b 100644 (file)
@@ -3,17 +3,7 @@
 {% block title %}{{ 'entry.page_titles.unread'|trans }}{% endblock %}
 
 {% block content %}
-    {% block pager %}
-        <div class="results">
-            <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div>
-            <div class="pagination">
-                <a href="#" id="filter">{{ 'entry.filters.title'|trans }}</a>
-                {% if entries.getNbPages > 1 %}
-                    {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
-                {% endif %}
-            </div>
-        </div>
-    {% endblock %}
+    {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %}
 
     {% for entry in entries %}
         <div id="entry-{{ entry.id|e }}" class="entry">
         </form>
     </aside>
 
+    {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %}
 {% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig
new file mode 100644 (file)
index 0000000..ac74676
--- /dev/null
@@ -0,0 +1,11 @@
+{% block pager %}
+    <div class="results">
+        <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div>
+        <div class="pagination">
+            <a href="#" id="filter">{{ 'entry.filters.title'|trans }}</a>
+            {% if entries.getNbPages > 1 %}
+                {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
+            {% endif %}
+        </div>
+    </div>
+{% endblock %}
index bb0ca93974021cae14b29a12887ecb457c665b0c..524a1d237bd818dfe3749854acd6fa7debdbcb80 100644 (file)
@@ -9,7 +9,7 @@
 
     <ul>
     {% for tag in tags %}
-        <li id="tag-{{ tag.id|e }}">{{tag.label}} ({{ tag.entries.getValues | length }})</li>
+        <li id="tag-{{ tag.id|e }}">{{tag.label}} ({{ tag.getEntriesByUserId(app.user.id) | length }})</li>
     {% endfor %}
     </ul>
 {% endblock %}
index 1abbceed5324b3238d4748f8f73d3b1ca937e738..cc4038c5803b200e4586dfae19a62c1b10f322fc 100644 (file)
 {% endblock %}
 
 {% block content %}
-    {% block pager %}
-    <div class="results clearfix">
-        <div class="nb-results left">
-            {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
-        </div>
-        {% if entries.getNbPages > 1 %}
-            {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
-        {% endif %}
-    </div>
-    {% endblock %}
+    {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %}
     <br />
     <ul class="row data">
         {% for entry in entries %}
 
         </form>
     </div>
+    {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %}
 {% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/pager.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/pager.html.twig
new file mode 100644 (file)
index 0000000..6f8e60f
--- /dev/null
@@ -0,0 +1,10 @@
+{% block pager %}
+    <div class="results clearfix">
+        <div class="nb-results left">
+            {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
+        </div>
+        {% if entries.getNbPages > 1 %}
+            {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
+        {% endif %}
+    </div>
+{% endblock %}
index 6fd263d8efd43d5ea72ffa22d69c8a9b22733fa9..d958c4b85e51aaf3067791b13ce925a11ee2ca72 100644 (file)
@@ -9,7 +9,7 @@
     <br />
     <ul class="row data">
     {% for tag in tags %}
-        <li id="tag-{{ tag.id|e }}" class="col l4 m6 s12">{{tag.label}} ({{ tag.entries.getValues | length }})</li>
+        <li id="tag-{{ tag.id|e }}" class="col l4 m6 s12">{{tag.label}} ({{ tag.getEntriesByUserId(app.user.id) | length }})</li>
     {% endfor %}
     </ul>
 {% endblock %}