6 files changed, 44 insertions, 24 deletions

diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.zh.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.zh.yml
new file mode 100644
index 00000000..59dd7f1b
--- /dev/null
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.zh.yml
@@ -0,0 +1,40 @@
+settings_changed: 配置已更新
+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 导出
+import_with_rabbitmq: 启用 RabbitMQ 来异步导入数据
+import_with_redis: 启用 Redis 来异步导入数据
+shaarli_url: Shaarli 链接，如果该服务已被启用
+scuttle_url: Scuttle 链接，如果该服务已被启用
+unmark_url: Unmark 链接，如果该服务已被启用
+share_diaspora: 启用分享到 diaspora*
+share_mail: 启用邮件分享
+share_shaarli: 启用分享到 Shaarli
+share_scuttle: 启用分享到 Scuttle
+share_twitter: 启用分享到 Twitter
+share_unmark: 启用分享到 Unmark.it
+show_printlink: 展示一个用于打印内容的链接
+wallabag_support_url: wallabag 的支持链接
+entry: "文章"
+export: "导出"
+import: "导入"
+misc: "杂项"
+modify_settings: "申请"
+piwik_host: 你的网站在 Piwik 的主机名（不包括 http:// or https://）
+piwik_site_id: 你的网站在 Piwik 的 ID
+piwik_enabled: 启用 Piwik
+demo_mode_enabled: "启用演示模式？(仅用于 wallabag 公开演示)"
+demo_mode_username: "Demo user"
+share_public: 允许为项目启用公开链接
+download_images_enabled: 在本地缓存图片
+restricted_access: 启用针对带有付费墙网站的认证
+api_user_registration: 允许新用户通过 API 注册
+store_article_headers: 让 wallabag 存储每篇文章的 HTTP header
+shaarli_share_origin_url: 选择分享原始链接到 Shaarli，如果该服务已被启用
diff --git a/app/Resources/static/themes/material/index.js b/app/Resources/static/themes/material/index.js
index e808d75c..da055e80 100755
--- a/app/Resources/static/themes/material/index.js
+++ b/app/Resources/static/themes/material/index.js
@@ -57,9 +57,9 @@ $(document).ready(() => {
   $('.datepicker').pickadate({
     selectMonths: true,
     selectYears: 15,
-    formatSubmit: 'dd/mm/yyyy',
-    hiddenName: true,
-    format: 'dd/mm/yyyy',
+    formatSubmit: 'yyyy-mm-dd',
+    hiddenName: false,
+    format: 'yyyy-mm-dd',
     container: 'body',
   });
 
diff --git a/app/config/capistrano/deploy.rb b/app/config/capistrano/deploy.rb
deleted file mode 100644
index fee04620..00000000
--- a/app/config/capistrano/deploy.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# config valid only for current version of Capistrano
-
-set :application, 'wallabag'
-set :repo_url, 'git@github.com:wallabag/wallabag.git'
-
-set :ssh_user, 'framasoft_bag'
-server '78.46.248.87', user: fetch(:ssh_user), roles: %w{web app db}
-
-set :format, :pretty
-set :log_level, :info
-# set :log_level, :debug
-
-set :composer_install_flags, '--no-dev --prefer-dist --no-interaction --optimize-autoloader'
-
-set :linked_files, %w{app/config/parameters.yml}
-set :linked_dirs, [fetch(:log_path), "var/sessions", "web/uploads", "data"]
-set :keep_releases, 3
-
-after 'deploy:updated', 'symfony:cache:clear'
diff --git a/app/config/capistrano/deploy/production.rb b/app/config/capistrano/deploy/production.rb
deleted file mode 100644
index e69de29b..00000000
--- a/app/config/capistrano/deploy/production.rb
+++ /dev/null
diff --git a/app/config/capistrano/deploy/staging.rb b/app/config/capistrano/deploy/staging.rb
deleted file mode 100644
index ad899a85..00000000
--- a/app/config/capistrano/deploy/staging.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-set :branch, 'master'
-set :deploy_to, '/var/www/v2.wallabag.org/web/'
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
index c54d7eb7..611c8414 100644
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@@ -16,6 +16,7 @@ wallabag_core:
         it: 'Italiano'
         pt: 'Português'
         ru: 'Русский'
+        zh: '简体中文'
     items_on_page: 12
     theme: material
     language: '%locale%'