From 098a8426162f90155aecd29f5fd2e22ba7ab95db Mon Sep 17 00:00:00 2001
From: LeoSirius <851958789@qq.com>
Date: Wed, 24 Apr 2019 11:22:55 +0800
Subject: [PATCH] add translation, optimize code

---
 seahub/templates/shared_file_view_react.html |  2 +-
 seahub/templates/view_shared_dir_react.html  |  2 +-
 seahub/views/file.py                         |  8 ++++----
 seahub/views/repo.py                         | 10 ++--------
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/seahub/templates/shared_file_view_react.html b/seahub/templates/shared_file_view_react.html
index 4d01bf5711..b03c7be612 100644
--- a/seahub/templates/shared_file_view_react.html
+++ b/seahub/templates/shared_file_view_react.html
@@ -5,7 +5,7 @@
 {% block extra_ogp_tags %}
 <meta property="og:type" content="object" />
 <meta property="og:site_name" content="{{ site_name }}">
-<meta property="og:url" content="{{ file_share_link }}" />
+<meta property="og:url" content="{{ service_url }}{{ file_share_link }}" />
 <meta property="og:title" content="{{ file_name }}" />
 <meta property="og:image" content="{{ service_url }}{{ MEDIA_URL }}img/file/{{ icon_path_for_ogp }}" />
 <meta property="og:description" content="{{ desc_for_ogp }}" />
diff --git a/seahub/templates/view_shared_dir_react.html b/seahub/templates/view_shared_dir_react.html
index ef43d10993..f719d4e697 100644
--- a/seahub/templates/view_shared_dir_react.html
+++ b/seahub/templates/view_shared_dir_react.html
@@ -5,7 +5,7 @@
 {% block extra_ogp_tags %}
 <meta property="og:type" content="object" />
 <meta property="og:site_name" content="{{ site_name }}">
-<meta property="og:url" content="{{ dir_share_link }}" />
+<meta property="og:url" content="{{ service_url }}{{ dir_share_link }}" />
 <meta property="og:title" content="{{ dir_name }}" />
 <meta property="og:image" content="{{ service_url }}{{ MEDIA_URL }}img/folder-192.png" />
 <meta property="og:description" content="{{ desc_for_ogp }}" />
diff --git a/seahub/views/file.py b/seahub/views/file.py
index 2fbb35d401..5467668e8a 100644
--- a/seahub/views/file.py
+++ b/seahub/views/file.py
@@ -1239,8 +1239,8 @@ def view_shared_file(request, fileshare):
         else:
             raw_path = urlquote(SITE_ROOT + get_share_link_thumbnail_src(token, XMIND_IMAGE_SIZE, path))
 
-    file_share_link = gen_file_share_link(fileshare.token)
-    desc_for_ogp = 'Share link for ' + filename
+    file_share_link = request.path
+    desc_for_ogp = _(u'Share link for %s.') % filename
     icon_path_for_ogp = file_icon_filter(filename, size=192)
 
     return render(request, template, {
@@ -1451,8 +1451,8 @@ def view_file_via_shared_dir(request, fileshare):
         else:
             raw_path = urlquote(SITE_ROOT + get_share_link_thumbnail_src(token, XMIND_IMAGE_SIZE, req_path))
 
-    file_share_link = gen_file_share_link(fileshare.token)
-    desc_for_ogp = 'Share link for ' + filename
+    file_share_link = request.path
+    desc_for_ogp = _(u'Share link for %s.') % filename
     icon_path_for_ogp = file_icon_filter(filename, size=192)
 
     return render(request, template, {
diff --git a/seahub/views/repo.py b/seahub/views/repo.py
index b86aa5ad34..e7908c6531 100644
--- a/seahub/views/repo.py
+++ b/seahub/views/repo.py
@@ -279,14 +279,8 @@ def view_shared_dir(request, fileshare):
     #template = 'view_shared_dir.html'
     template = 'view_shared_dir_react.html'
 
-    dir_share_link = gen_dir_share_link(token)
-
-    # desc_for_opg_tags = ''
-    # for i, dirent in enumerate(dir_list):
-    #     desc_for_opg_tags += dirent.obj_name + ' '
-    # for i, dirent in enumerate(file_list):
-    #     desc_for_opg_tags += dirent.obj_name + ' '
-    desc_for_ogp = 'Share link for ' + dir_name
+    dir_share_link = request.path
+    desc_for_ogp = _(u'Share link for %s.') % dir_name
 
     return render(request, template, {
             'repo': repo,