6 files changed, 72 insertions, 7 deletions

diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
new file mode 100644
index 00000000..7cb4e833
--- /dev/null
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
@@ -0,0 +1,24 @@
+download_pictures: تصاویر را در کارگزار خودتان باربگیرید
+carrot: فعال‌سازی هم‌رسانی به Carrot
+diaspora_url: نشانی Diaspora، اگر فعال بود
+export_epub: فعال‌سازی برون‌سپاری به ePub
+export_mobi: فعال‌سازی برون‌سپاری به mobi
+export_pdf:  فعال‌سازی برون‌سپاری به PDF
+export_csv:  فعال‌سازی برون‌سپاری به CSV
+export_json:  فعال‌سازی برون‌سپاری به JSON
+export_txt:  فعال‌سازی برون‌سپاری به TXT
+export_xml:  فعال‌سازی برون‌سپاری به XML
+pocket_consumer_key: کلید کاربری Pocket برای درون‌ریزی مطالب (https://getpocket.com/developer/docs/authentication)
+shaarli_url: نشانی Shaarli، اگر فعال بود
+share_diaspora: فعال‌سازی هم‌رسانی به Diaspora
+share_mail:  فعال‌سازی هم‌رسانی با ایمیل
+share_shaarli:  فعال‌سازی هم‌رسانی به Shaarli
+share_twitter:  فعال‌سازی هم‌رسانی به Twitter
+show_printlink: نمایش پیوندی برای چاپ مطلب
+wallabag_support_url: نشانی صفحهٔ پشتیبانی wallabag
+wallabag_url: نشانی صفحهٔ wallabag *شما*
+entry: "مقاله"
+export: "برون‌سپاری"
+import: "درون‌ریزی"
+misc: "غیره"
+modify_settings: "اعمال"
diff --git a/app/config/capistrano/deploy.rb b/app/config/capistrano/deploy.rb
index c2562965..f15eef30 100644
--- a/app/config/capistrano/deploy.rb
+++ b/app/config/capistrano/deploy.rb
@@ -1,6 +1,10 @@
 # config valid only for current version of Capistrano
 lock '3.4.0'
 
+set :log_path, "var/logs"
+set :cache_path, "var/cache"
+set :symfony_console_path, 'bin/console'
+
 set :application, 'wallabag'
 set :repo_url, 'git@github.com:wallabag/wallabag.git'
 
@@ -16,8 +20,7 @@ set :log_level, :info
 set :composer_install_flags, '--no-dev --prefer-dist --no-interaction --optimize-autoloader'
 
 set :linked_files, %w{app/config/parameters.yml}
-set :linked_dirs, %w{app/logs web/uploads data}
-
+set :linked_dirs, [fetch(:log_path), "var/sessions", "web/uploads", "data"]
 set :keep_releases, 3
 
 after 'deploy:finishing', 'deploy:cleanup'
diff --git a/docs/en/developer/docker.rst b/docs/en/developer/docker.rst
index 9ed9dde2..aece2984 100644
--- a/docs/en/developer/docker.rst
+++ b/docs/en/developer/docker.rst
@@ -1,4 +1,4 @@
-Run Wallabag in docker-compose
+Run wallabag in docker-compose
 ==============================
 
 In order to run your own development instance of wallabag, you may
@@ -15,8 +15,8 @@ your system and up to date.
 Switch DBMS
 -----------
 
-By default, Wallabag will start with a sqlite database.
-Since Wallabag provide support for Postgresql and MySQL, docker
+By default, wallabag will start with a sqlite database.
+Since wallabag provides support for Postgresql and MySQL, docker
 containers are also available for these ones.
 
 In ``docker-compose.yml``, for the chosen DBMS uncomment :
@@ -33,7 +33,7 @@ In order to keep running Symfony commands on your host (such as
   like ``SYMFONY__ENV__DATABASE_HOST`` will exist.
 - create a ``127.0.0.1 rdbms`` on your system ``hosts`` file
 
-Run Wallabag
+Run wallabag
 ------------
 
 #. Fork and clone the project
diff --git a/docs/en/developer/translate.rst b/docs/en/developer/translate.rst
new file mode 100644
index 00000000..ff2b8f0e
--- /dev/null
+++ b/docs/en/developer/translate.rst
@@ -0,0 +1,34 @@
+Translate wallabag
+==================
+
+Translation files
+-----------------
+
+You can find translation files here: https://github.com/wallabag/wallabag/tree/v2/src/Wallabag/CoreBundle/Resources/translations.
+
+You have to create ``messages.CODE.yml`` and ``validators.CODE.yml``, where CODE is the the ISO 639-1 code of your language (`see wikipedia <https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes>`__).
+
+There is still one file to translate: https://github.com/wallabag/wallabag/tree/v2/app/Resources/CraueConfigBundle/translations.
+
+You have to create ``CraueConfigBundle.CODE.yml``.
+
+Configuration file
+------------------
+
+You have to edit `app/config/config.yml
+<https://github.com/wallabag/wallabag/blob/v2/app/config/config.yml>`__ to display your language on Configuration page of wallabag (to allow users to switch to this new translation).
+
+Under the ``wallabag_core.languages`` section, you have to add a new line for with your translation. For example
+
+::
+
+    wallabag_core:
+        ...
+        languages:
+            en: 'English'
+            fr: 'Français'
+
+
+For the first column (``en``, ``fr``, etc.), you have to add the ISO 639-1 code of your language (see above).
+
+For the second column, it's the name of your language. Just that.
diff --git a/docs/en/index.rst b/docs/en/index.rst
index 7dd01b39..acd9b383 100644
--- a/docs/en/index.rst
+++ b/docs/en/index.rst
@@ -34,4 +34,5 @@ The main documentation for this application is organized into a couple sections:
    :maxdepth: 2
    :caption: Developer documentation
 
-   developer/docker
\ No newline at end of file
+   developer/docker
+   developer/translate
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml
new file mode 100644
index 00000000..fe63af76
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml
@@ -0,0 +1,3 @@
+# Config screen
+The password fields must match: 'رمزها باید یکی باشند'
+Password should by at least 8 chars long: 'رمز شما باید ۸ حرف یا بیشتر باشد'