Simplified "clone with" translation strings

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index 4752e99d3cdf404df0eac9d57ab046a96b02133d..c0c9b5b8a79d6260332da46ce359875bcc182e13 100644 (file)
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -452,7 +452,4 @@ gb.incrementalPushTagMessage = Auto-tagged [{0}] branch on push
 gb.externalPermissions = {0} access permissions for {1} are externally maintained\r
 gb.viewAccess = You do not have Gitblit read or write access\r
 gb.yourProtocolPermissionIs = Your {0} access permission for {1} is {2}\r
-gb.cloneWithSparkleShare = clone with SparkleShare\u2122\r
-gb.cloneWithSourceTree = clone with SourceTree\u2122\r
-gb.cloneWithGitHub = clone with GitHub\u2122 for {0}\r
-gb.cloneWithSmartGit = clone with SmartGit\u2122
\ No newline at end of file
+gb.cloneWithApp  = clone with {0}
\ No newline at end of file

diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.java b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.java
index 3afb7b157fcc08d453abb5fe36d4f723c0969302..892f1ca8c747498f94886e2613c9af1272db1d91 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.java
@@ -83,36 +83,39 @@ public class RepositoryUrlPanel extends BasePanel {
                        add(new Label("repositoryGitDaemonUrl").setVisible(false));\r
                }\r
                \r
+               String cloneWith = localizer.getString("gb.cloneWithApp", owner);\r
                final List<AppCloneLink> cloneLinks = new ArrayList<AppCloneLink>();\r
                if (user.canClone(repository) && GitBlit.getBoolean(Keys.web.allowAppCloneLinks, true)) {\r
                        // universal app clone urls\r
-//                     cloneLinks.add(new AppCloneLink(localizer.getString("gb.cloneWithSmartGit", owner),\r
+//                     cloneLinks.add(new AppCloneLink(MessageFormat.format(cloneWith, "SmartGit\u2122"),\r
 //                                     MessageFormat.format("smartgit://cloneRepo/{0}", primaryUrl),\r
 //                                     "Syntevo SmartGit\u2122"));\r
 \r
                        if (isWindows()) {\r
                                // Windows client app clone urls\r
-                               cloneLinks.add(new AppCloneLink(localizer.getString("gb.cloneWithSourceTree", owner),\r
+                               cloneLinks.add(new AppCloneLink(MessageFormat.format(cloneWith, "SourceTree\u2122"),\r
                                                MessageFormat.format("sourcetree://cloneRepo/{0}", primaryUrl),\r
                                                "Atlassian SourceTree\u2122"));\r
 //                             cloneLinks.add(new AppCloneLink(\r
-//                                             MessageFormat.format(localizer.getString("gb.cloneWithGitHub", owner), "Windows"),\r
-//                                             MessageFormat.format("github-windows://openRepo/{0}", primaryUrl)));\r
+//                                             MessageFormat.format(cloneWith, "GitHub\u2122 for Windows"),\r
+//                                             MessageFormat.format("github-windows://openRepo/{0}", primaryUrl),\r
+//                                             "GitHub\u2122 for Windows"));\r
                        } else if (isMac()) {\r
                                // Mac client app clone urls\r
-                               cloneLinks.add(new AppCloneLink(localizer.getString("gb.cloneWithSourceTree", owner),\r
+                               cloneLinks.add(new AppCloneLink(MessageFormat.format(cloneWith, "SourceTree\u2122"),\r
                                                MessageFormat.format("sourcetree://cloneRepo/{0}", primaryUrl),\r
                                                "Atlassian SourceTree\u2122"));\r
 //                             cloneLinks.add(new AppCloneLink(\r
-//                                             MessageFormat.format(localizer.getString("gb.cloneWithGitHub", owner), "Mac"),\r
-//                                             MessageFormat.format("github-mac://openRepo/{0}", primaryUrl)));\r
+//                                             MessageFormat.format(cloneWith, "GitHub\u2122 for Mac"),\r
+//                                             MessageFormat.format("github-mac://openRepo/{0}", primaryUrl),\r
+//                                             "GitHub\u2122 for Mac"));\r
                        }\r
 \r
                        // sparkleshare invite url\r
                        String sparkleshareUrl = getSparkleShareInviteUrl(user, repository);\r
                        if (!StringUtils.isEmpty(sparkleshareUrl)) {\r
-                               cloneLinks.add(new AppCloneLink(localizer.getString("gb.cloneWithSparkleShare", owner),\r
-                                               sparkleshareUrl, "SparkleShare \u2122", "icon-star"));\r
+                               cloneLinks.add(new AppCloneLink(MessageFormat.format(cloneWith, "SparkleShare\u2122"),\r
+                                               sparkleshareUrl, "SparkleShare\u2122", "icon-star"));\r
                        }\r
                }\r
 \r