Skip to content

[stable9] Fix multi translation names and descriptions #1690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 5 commits into from
Oct 11, 2016
Merged

[stable9] Fix multi translation names and descriptions #1690

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
45d5f7a
Allow multiple names and description
nickvergessen Oct 11, 2016
a61cab8
Fix displaying and searching with multiple authors
nickvergessen Sep 30, 2016
ee2d772
Fallback from "de" to "de_DE" and the other way around
nickvergessen Oct 11, 2016
a6859fd
Fix authors that have a mail or homepage
nickvergessen Oct 11, 2016
4074d90
Better search functionality
nickvergessen Oct 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Allow multiple names and description 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Oct 11, 2016
commit 45d5f7adc22cb7e32c4a8fa119e6cff90b5e5fb1
47 changes: 40 additions & 7 deletions lib/private/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,15 +606,16 @@ public static function getAppVersionByPath($path) {
* Read all app metadata from the info.xml file
*
* @param string $appId id of the app or the path of the info.xml file
* @param boolean $path (optional)
* @param boolean $path
* @param string $lang
* @return array|null
* @note all data is read from info.xml, not just pre-defined fields
*/
public static function getAppInfo($appId, $path = false) {
public static function getAppInfo($appId, $path = false, $lang = null) {
if ($path) {
$file = $appId;
} else {
if (isset(self::$appInfo[$appId])) {
if ($lang === null && isset(self::$appInfo[$appId])) {
return self::$appInfo[$appId];
}
$appPath = self::getAppPath($appId);
Expand All @@ -628,7 +629,7 @@ public static function getAppInfo($appId, $path = false) {
$data = $parser->parse($file);

if (is_array($data)) {
$data = OC_App::parseAppInfo($data);
$data = OC_App::parseAppInfo($data, $lang);
}
if(isset($data['ocsid'])) {
$storedId = \OC::$server->getConfig()->getAppValue($appId, 'ocsid');
Expand All @@ -637,7 +638,9 @@ public static function getAppInfo($appId, $path = false) {
}
}

self::$appInfo[$appId] = $data;
if ($lang === null) {
self::$appInfo[$appId] = $data;
}

return $data;
}
Expand Down Expand Up @@ -787,11 +790,12 @@ public static function listAllApps($onlyLocal = false,
//we don't want to show configuration for these
$blacklist = \OC::$server->getAppManager()->getAlwaysEnabledApps();
$appList = array();
$langCode = \OC::$server->getL10N('core')->getLanguageCode();

foreach ($installedApps as $app) {
if (array_search($app, $blacklist) === false) {

$info = OC_App::getAppInfo($app);
$info = OC_App::getAppInfo($app, false, $langCode);
if (!is_array($info)) {
\OCP\Util::writeLog('core', 'Could not read app info file for app "' . $app . '"', \OCP\Util::ERROR);
continue;
Expand Down Expand Up @@ -1200,13 +1204,42 @@ public static function getStorage($appId) {
}
}

protected static function findBestL10NOption($options, $lang) {
$fallback = $englishFallback = false;
foreach ($options as $option) {
if (is_array($option)) {
if ($fallback === false) {
$fallback = $option['@value'];
}

if (isset($option['@attributes']['lang']) && $option['@attributes']['lang'] === $lang) {
return $option['@value'];
}
} else {
$englishFallback = $option;
}
}
return $englishFallback !== false ? $englishFallback : (string) $fallback;
}

/**
* parses the app data array and enhanced the 'description' value
*
* @param array $data the app data
* @param string $lang
* @return array improved app data
*/
public static function parseAppInfo(array $data) {
public static function parseAppInfo(array $data, $lang = null) {

if ($lang && isset($data['name']) && is_array($data['name'])) {
$data['name'] = self::findBestL10NOption($data['name'], $lang);
}
if ($lang && isset($data['summary']) && is_array($data['summary'])) {
$data['summary'] = self::findBestL10NOption($data['summary'], $lang);
}
if ($lang && isset($data['description']) && is_array($data['description'])) {
$data['description'] = self::findBestL10NOption($data['description'], $lang);
}

// just modify the description if it is available
// otherwise this will create a $data element with an empty 'description'
Expand Down