more strings to translate in utils also some fixes in defaults

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/private/defaults.php b/lib/private/defaults.php
index 663c327a3b0..c039c30fbb9 100644
--- a/lib/private/defaults.php
+++ b/lib/private/defaults.php
@@ -19,12 +19,14 @@ class OC_Defaults {
 	private $defaultBaseUrl;
 	private $defaultSyncClientUrl;
 	private $defaultDocBaseUrl;
+	private $defaultDocVersion;
 	private $defaultSlogan;
 	private $defaultLogoClaim;
 	private $defaultMailHeaderColor;
 
 	function __construct() {
-		$this->l = OC_L10N::get('core');
+		$this->l = OC_L10N::get('lib');
+		$version = OC_Util::getVersion();
 
 		$this->defaultEntity = "ownCloud"; /* e.g. company name, used for footers and copyright notices */
 		$this->defaultName = "ownCloud"; /* short name, used when referring to the software */
@@ -32,6 +34,7 @@ class OC_Defaults {
 		$this->defaultBaseUrl = "https://owncloud.org";
 		$this->defaultSyncClientUrl = "https://owncloud.org/sync-clients/";
 		$this->defaultDocBaseUrl = "http://doc.owncloud.org";
+		$this->defaultDocVersion = $version[0] . ".0"; // used to generate doc links
 		$this->defaultSlogan = $this->l->t("web services under your control");
 		$this->defaultLogoClaim = "";
 		$this->defaultMailHeaderColor = "#1d2d44"; /* header color of mail notifications */
@@ -180,7 +183,7 @@ class OC_Defaults {
 		if ($this->themeExist('buildDocLinkToKey')) {
 			return $this->theme->buildDocLinkToKey($key);
 		}
-		return $this->getDocBaseUrl() . '/server/6.0/go.php?to=' . $key;
+		return $this->getDocBaseUrl() . '/server/' . $this->defaultDocVersion . '/go.php?to=' . $key;
 	}
 
 	/**