Merge remote-tracking branch 'upstream/develop' into avoid-duplicates

This commit is contained in:
Michael 2021-04-29 05:49:00 +00:00
commit 5c9a5e736c
6 changed files with 362 additions and 333 deletions

View file

@ -20,8 +20,9 @@ jobs:
echo "::group::Check messages.po"
# Skip first 4 lines in possible diff, because they're header
# Skip all lines of the git diff starting with "@@" or comments or starting "POT-Creation-Date"
if [[ $(git diff -U0 ./view/lang/C/messages.po | awk '!/@@|-"POT-Creation-Date|+"POT-Creation-Date|-#|+#/{print }' | wc -l) > 4 ]]; then
if [[ $(git diff -U0 ./view/lang/C/messages.po | awk '!/@@|-"POT-Creation-Date|+"POT-Creation-Date|-#|+#/{print }' | wc -l) -gt 4 ]]; then
echo "::error file=messages.po::messages.po is out of date"
echo "$(git diff ./view/lang/C/messages.po)"
exit 1
else
echo "Nothing to update"

View file

@ -61,7 +61,7 @@ KEYWORDS="-k -kt -ktt:1,2"
echo "Extract strings to $OUTFILE.."
rm "$OUTFILE"; touch "$OUTFILE"
find_result=$(find "$FINDSTARTDIR" $FINDOPTS -name "*.php" -type f | sort)
find_result=$(find "$FINDSTARTDIR" $FINDOPTS -name "*.php" -type f | LC_ALL=C sort --stable)
total_files=$(wc -l <<< "${find_result}")

View file

@ -52,6 +52,10 @@ class User extends \Asika\SimpleConsole\Console
* @var Database
*/
private $dba;
/**
* @var IPConfig
*/
private $pConfig;
protected function getHelp()
{
@ -89,13 +93,14 @@ HELP;
return $help;
}
public function __construct(App\Mode $appMode, L10n $l10n, Database $dba, array $argv = null)
public function __construct(App\Mode $appMode, L10n $l10n, Database $dba, IPConfig $pConfig, array $argv = null)
{
parent::__construct($argv);
$this->appMode = $appMode;
$this->l10n = $l10n;
$this->dba = $dba;
$this->appMode = $appMode;
$this->l10n = $l10n;
$this->dba = $dba;
$this->pConfig = $pConfig;
}
protected function doExecute()
@ -338,8 +343,8 @@ HELP;
private function listUser()
{
$subCmd = $this->getArgument(1);
$start = $this->getOption(['s', 'start'], 0);
$count = $this->getOption(['c', 'count'], Pager::ITEMS_PER_PAGE);
$start = $this->getOption(['s', 'start'], 0);
$count = $this->getOption(['c', 'count'], Pager::ITEMS_PER_PAGE);
$table = new Console_Table();
@ -403,7 +408,7 @@ HELP;
];
$subCmd = $this->getArgument(1);
$param = $this->getArgument(2);
$param = $this->getArgument(2);
$table = new Console_Table();
$table->setHeaders(['UID', 'GUID', 'Name', 'Nick', 'E-Mail', 'Register', 'Login', 'Verified', 'Blocked']);
@ -463,8 +468,7 @@ HELP;
}
}
$pconfig = \Friendica\DI::pConfig();
$values = $pconfig->load($user['uid'], $category);
$values = $this->pConfig->load($user['uid'], $category);
switch ($subCmd) {
case 'list':
@ -499,8 +503,8 @@ HELP;
}
if (array_key_exists($category, $values) and
array_key_exists($key, $values[$category]) and
$values[$category][$key] == $value) {
array_key_exists($key, $values[$category]) and
$values[$category][$key] == $value) {
throw new RuntimeException('Value not changed');
}

View file

@ -35,7 +35,7 @@ interface IPConfig
* @param int $uid The user_id
* @param string $cat The category of the configuration value
*
* @return void
* @return array The loaded config array
* @see Cache
*
*/

View file

@ -68,6 +68,8 @@ class PreloadPConfig extends BasePConfig
// load the whole category out of the DB into the cache
$this->configCache->load($uid, $config);
return $config;
}
/**

File diff suppressed because it is too large Load diff