[Pkg-owncloud-commits] [owncloud-client] 438/470: Fix nautilus and nemo plugin branding strings. (#4780)

Sandro Knauß hefee-guest at moszumanska.debian.org
Thu May 12 16:25:40 UTC 2016


This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 641125eac162a0dbd3bcf2ee792688bb7349ad93
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Tue May 3 11:36:56 2016 +0200

    Fix nautilus and nemo plugin branding strings. (#4780)
    
    * Fix nautilus and nemo plugin branding strings.
    
    Fix for owncloud/enterprise#1314
    
    * nautilus plugin: Add a comment why the line needs to stay unchanged.
---
 shell_integration/nautilus/syncstate.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/shell_integration/nautilus/syncstate.py b/shell_integration/nautilus/syncstate.py
index ca74ed0..f4e7908 100644
--- a/shell_integration/nautilus/syncstate.py
+++ b/shell_integration/nautilus/syncstate.py
@@ -21,11 +21,15 @@ import socket
 
 from gi.repository import GObject, Nautilus
 
-print("Initializing owncloud-client-nautilus extension")
-
-# Do not touch the following line.
+# Please do not touch the following line.
+# The reason is that we use a script to adopt this file for branding
+# by replacing this line with the branding app name. If the following
+# line is changed, the script can not match the pattern and fails.
 appname = 'ownCloud'
 
+print("Initializing "+appname+"-client-nautilus extension")
+
+
 def get_local_path(url):
     if url[0:7] == 'file://':
         url = url[7:]
@@ -181,10 +185,10 @@ class MenuExtension(GObject.GObject, Nautilus.MenuProvider):
         if not syncedFile:
             return items
 
-        # Create an menu item
+        # Create a menu item
         labelStr = "Share with " + appname + "..."
         item = Nautilus.MenuItem(name='NautilusPython::ShareItem', label=labelStr,
-                tip='Share file %s through ownCloud' % file.get_name())
+                tip='Share file {} through {}'.format(file.get_name(), appname) )
         item.connect("activate", self.menu_share, file)
         items.append(item)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git



More information about the Pkg-owncloud-commits mailing list