17 files changed, 82 insertions, 3 deletions
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 9a1ede021a7..a4850fb4b38 100644
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -686,6 +686,7 @@ return array(
     'OC\\Repair\\NC11\\FixMountStorages' => $baseDir . '/lib/private/Repair/NC11/FixMountStorages.php',
     'OC\\Repair\\NC11\\MoveAvatars' => $baseDir . '/lib/private/Repair/NC11/MoveAvatars.php',
     'OC\\Repair\\NC11\\MoveAvatarsBackgroundJob' => $baseDir . '/lib/private/Repair/NC11/MoveAvatarsBackgroundJob.php',
+    'OC\\Repair\\NC12\\UpdateLanguageCodes' => $baseDir . '/lib/private/Repair/NC12/UpdateLanguageCodes.php',
     'OC\\Repair\\OldGroupMembershipShares' => $baseDir . '/lib/private/Repair/OldGroupMembershipShares.php',
     'OC\\Repair\\RemoveRootShares' => $baseDir . '/lib/private/Repair/RemoveRootShares.php',
     'OC\\Repair\\RepairInvalidShares' => $baseDir . '/lib/private/Repair/RepairInvalidShares.php',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index 329773cd6eb..654161214b2 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -716,6 +716,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
         'OC\\Repair\\NC11\\FixMountStorages' => __DIR__ . '/../../..' . '/lib/private/Repair/NC11/FixMountStorages.php',
         'OC\\Repair\\NC11\\MoveAvatars' => __DIR__ . '/../../..' . '/lib/private/Repair/NC11/MoveAvatars.php',
         'OC\\Repair\\NC11\\MoveAvatarsBackgroundJob' => __DIR__ . '/../../..' . '/lib/private/Repair/NC11/MoveAvatarsBackgroundJob.php',
+        'OC\\Repair\\NC12\\UpdateLanguageCodes' => __DIR__ . '/../../..' . '/lib/private/Repair/NC12/UpdateLanguageCodes.php',
         'OC\\Repair\\OldGroupMembershipShares' => __DIR__ . '/../../..' . '/lib/private/Repair/OldGroupMembershipShares.php',
         'OC\\Repair\\RemoveRootShares' => __DIR__ . '/../../..' . '/lib/private/Repair/RemoveRootShares.php',
         'OC\\Repair\\RepairInvalidShares' => __DIR__ . '/../../..' . '/lib/private/Repair/RepairInvalidShares.php',
diff --git a/lib/l10n/bg_BG.js b/lib/l10n/bg.js
index 2692a983790..2692a983790 100644
--- a/lib/l10n/bg_BG.js
+++ b/lib/l10n/bg.js
diff --git a/lib/l10n/bg_BG.json b/lib/l10n/bg.json
index 279f13f1bc3..279f13f1bc3 100644
--- a/lib/l10n/bg_BG.json
+++ b/lib/l10n/bg.json
diff --git a/lib/l10n/cs_CZ.js b/lib/l10n/cs.js
index ff0b5705cea..ff0b5705cea 100644
--- a/lib/l10n/cs_CZ.js
+++ b/lib/l10n/cs.js
diff --git a/lib/l10n/cs_CZ.json b/lib/l10n/cs.json
index ae66663d49c..ae66663d49c 100644
--- a/lib/l10n/cs_CZ.json
+++ b/lib/l10n/cs.json
diff --git a/lib/l10n/hu_HU.js b/lib/l10n/hu.js
index 1ca8068cf77..1ca8068cf77 100644
--- a/lib/l10n/hu_HU.js
+++ b/lib/l10n/hu.js
diff --git a/lib/l10n/hu_HU.json b/lib/l10n/hu.json
index a3f22bc7d5b..a3f22bc7d5b 100644
--- a/lib/l10n/hu_HU.json
+++ b/lib/l10n/hu.json
diff --git a/lib/l10n/nb_NO.js b/lib/l10n/nb.js
index 0fcaa03b246..0fcaa03b246 100644
--- a/lib/l10n/nb_NO.js
+++ b/lib/l10n/nb.js
diff --git a/lib/l10n/nb_NO.json b/lib/l10n/nb.json
index 5e745167303..5e745167303 100644
--- a/lib/l10n/nb_NO.json
+++ b/lib/l10n/nb.json
diff --git a/lib/l10n/ru.js b/lib/l10n/ru.js
index 869ec6055f2..e3b9fcb52bc 100644
--- a/lib/l10n/ru.js
+++ b/lib/l10n/ru.js
@@ -166,7 +166,7 @@ OC.L10N.register(
     "No app name specified" : "Не указано имя приложения",
     "App '%s' could not be installed!" : "Приложение '%s' не может быть установлено!",
     "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "Приложение \"%s\" не может быть установлено, так как следующие зависимости не выполнены: %s",
-    "a safe home for all your data" : "надежный дом для ваших файлов",
+    "a safe home for all your data" : "надежный дом для всех ваших данных",
     "File is currently busy, please try again later" : "Файл в данный момент используется, повторите попытку позже.",
     "Can't read file" : "Не удается прочитать файл",
     "Application is not enabled" : "Приложение не разрешено",
diff --git a/lib/l10n/ru.json b/lib/l10n/ru.json
index 92ea68f8ac7..7ac544fd9fe 100644
--- a/lib/l10n/ru.json
+++ b/lib/l10n/ru.json
@@ -164,7 +164,7 @@
     "No app name specified" : "Не указано имя приложения",
     "App '%s' could not be installed!" : "Приложение '%s' не может быть установлено!",
     "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "Приложение \"%s\" не может быть установлено, так как следующие зависимости не выполнены: %s",
-    "a safe home for all your data" : "надежный дом для ваших файлов",
+    "a safe home for all your data" : "надежный дом для всех ваших данных",
     "File is currently busy, please try again later" : "Файл в данный момент используется, повторите попытку позже.",
     "Can't read file" : "Не удается прочитать файл",
     "Application is not enabled" : "Приложение не разрешено",
diff --git a/lib/l10n/sk_SK.js b/lib/l10n/sk.js
index e723baebea4..e723baebea4 100644
--- a/lib/l10n/sk_SK.js
+++ b/lib/l10n/sk.js
diff --git a/lib/l10n/sk_SK.json b/lib/l10n/sk.json
index 7deb8eb8ad8..7deb8eb8ad8 100644
--- a/lib/l10n/sk_SK.json
+++ b/lib/l10n/sk.json
diff --git a/lib/private/Repair.php b/lib/private/Repair.php
index 6344db64e8e..7f142a808aa 100644
--- a/lib/private/Repair.php
+++ b/lib/private/Repair.php
@@ -36,6 +36,7 @@ use OC\Repair\MoveUpdaterStepFile;
 use OC\Repair\NC11\CleanPreviews;
 use OC\Repair\NC11\FixMountStorages;
 use OC\Repair\NC11\MoveAvatars;
+use OC\Repair\NC12\UpdateLanguageCodes;
 use OC\Repair\OldGroupMembershipShares;
 use OC\Repair\RemoveRootShares;
 use OC\Repair\SqliteAutoincrement;
@@ -134,6 +135,7 @@ class Repair implements IOutput{
 				\OC::$server->getConfig()
 			),
 			new FixMountStorages(\OC::$server->getDatabaseConnection()),
+			new UpdateLanguageCodes(\OC::$server->getDatabaseConnection()),
 		];
 	}
 
diff --git a/lib/private/Repair/NC12/UpdateLanguageCodes.php b/lib/private/Repair/NC12/UpdateLanguageCodes.php
new file mode 100644
index 00000000000..ed65a5cbbe3
--- /dev/null
+++ b/lib/private/Repair/NC12/UpdateLanguageCodes.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Morris Jobke <hey@morrisjobke.de>
+ *
+ * @author Morris Jobke <hey@morrisjobke.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Repair\NC12;
+
+use OCP\IDBConnection;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
+
+class UpdateLanguageCodes implements IRepairStep {
+	/** @var IDBConnection */
+	private $connection;
+
+	/**
+	 * @param IDBConnection $db
+	 */
+	public function __construct(IDBConnection $connection) {
+		$this->connection = $connection;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getName() {
+		return 'Repair language codes';
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function run(IOutput $output) {
+		$languages = [
+			'bg_BG' => 'bg',
+			'cs_CZ' => 'cs',
+			'fi_FI' => 'fi',
+			'hu_HU' => 'hu',
+			'nb_NO' => 'nb',
+			'sk_SK' => 'sk',
+			'th_TH' => 'th',
+		];
+
+		foreach ($languages as $oldCode => $newCode) {
+			$qb = $this->connection->getQueryBuilder();
+
+			$affectedRows = $qb->update('preferences')
+				->set('configvalue', $qb->createNamedParameter($newCode))
+				->where($qb->expr()->eq('appid', $qb->createNamedParameter('core')))
+				->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter('lang')))
+				->andWhere($qb->expr()->eq('configvalue', $qb->createNamedParameter($oldCode)))
+				->execute();
+
+			$output->info('Changed ' . $affectedRows . ' setting(s) from "' . $oldCode . '" to "' . $newCode . '" in preferences table.');
+		}
+	}
+}
diff --git a/lib/private/Share20/ProviderFactory.php b/lib/private/Share20/ProviderFactory.php
index 79589739523..bbc6f4ffbd3 100644
--- a/lib/private/Share20/ProviderFactory.php
+++ b/lib/private/Share20/ProviderFactory.php
@@ -133,7 +133,7 @@ class ProviderFactory implements IProviderFactory {
 	/**
 	 * Create the federated share provider
 	 *
-	 * @return FederatedShareProvider
+	 * @return ShareByMailProvider
 	 */
 	protected function getShareByMailProvider() {
 		if ($this->shareByMailProvider === null) {