mirror of
https://github.com/wallabag/wallabag.git
synced 2025-07-12 16:58:37 +00:00
Nicolas Lœuillet
GitHub
commit
f99ddbc6f8
29 changed files with 68 additions and 19 deletions
|
|
@ -364,7 +364,7 @@ class InstallCommand extends ContainerAwareCommand
|
|||
],
|
||||
[
|
||||
'name' => 'piwik_host',
|
||||
'value' => 'http://v2.wallabag.org',
|
||||
'value' => 'v2.wallabag.org',
|
||||
'section' => 'analytics',
|
||||
],
|
||||
[
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ class LoadSettingData extends AbstractFixture implements OrderedFixtureInterface
|
|||
],
|
||||
[
|
||||
'name' => 'piwik_host',
|
||||
'value' => 'http://v2.wallabag.org',
|
||||
'value' => 'v2.wallabag.org',
|
||||
'section' => 'analytics',
|
||||
],
|
||||
[
|
||||
|
|
|
|||
|
|
@ -445,6 +445,9 @@ user:
|
|||
# delete_confirm: Are you sure?
|
||||
# back_to_list: Back to list
|
||||
|
||||
error:
|
||||
# page_title: An error occurred
|
||||
|
||||
flashes:
|
||||
config:
|
||||
notice:
|
||||
|
|
|
|||
|
|
@ -445,6 +445,9 @@ user:
|
|||
delete_confirm: Bist du sicher?
|
||||
back_to_list: Zurück zur Liste
|
||||
|
||||
error:
|
||||
# page_title: An error occurred
|
||||
|
||||
flashes:
|
||||
config:
|
||||
notice:
|
||||
|
|
|
|||
|
|
@ -445,6 +445,9 @@ user:
|
|||
delete_confirm: Are you sure?
|
||||
back_to_list: Back to list
|
||||
|
||||
error:
|
||||
page_title: An error occurred
|
||||
|
||||
flashes:
|
||||
config:
|
||||
notice:
|
||||
|
|
|
|||
|
|
@ -445,6 +445,9 @@ user:
|
|||
# delete_confirm: Are you sure?
|
||||
# back_to_list: Back to list
|
||||
|
||||
error:
|
||||
# page_title: An error occurred
|
||||
|
||||
flashes:
|
||||
config:
|
||||
notice:
|
||||
|
|
|
|||
|
|
@ -444,6 +444,9 @@ user:
|
|||
# delete_confirm: Are you sure?
|
||||
# back_to_list: Back to list
|
||||
|
||||
error:
|
||||
# page_title: An error occurred
|
||||
|
||||
flashes:
|
||||
config:
|
||||
notice:
|
||||
|
|
|
|||
|
|
@ -365,7 +365,7 @@ import:
|
|||
how_to: "Choisissez le fichier de sauvegarde de vos marques-page et cliquez sur le bouton pour l'importer. Soyez avertis que le processus peut prendre un temps assez long car tous les articles doivent être récupérés en ligne."
|
||||
instapaper:
|
||||
page_title: 'Import > Instapaper'
|
||||
description: 'Sur la page des paramètres (`https://www.instapaper.com/user<https://www.instapaper.com/user>`_), cliquez sur "Download .CSV file" dans la section "Export". Un fichier CSV se téléchargera ("instapaper-export.csv").'
|
||||
description: 'Sur la page des paramètres (https://www.instapaper.com/user), cliquez sur "Download .CSV file" dans la section "Export". Un fichier CSV se téléchargera ("instapaper-export.csv").'
|
||||
how_to: "Choisissez le fichier de votre export Instapaper et cliquez sur le bouton ci-dessous pour l'importer."
|
||||
|
||||
developer:
|
||||
|
|
@ -445,6 +445,9 @@ user:
|
|||
delete_confirm: Êtes-vous sûr?
|
||||
back_to_list: Revenir à la liste
|
||||
|
||||
error:
|
||||
page_title: Une erreur est survenue
|
||||
|
||||
flashes:
|
||||
config:
|
||||
notice:
|
||||
|
|
|
|||
|
|
@ -445,6 +445,9 @@ user:
|
|||
# delete_confirm: Are you sure?
|
||||
# back_to_list: Back to list
|
||||
|
||||
error:
|
||||
# page_title: An error occurred
|
||||
|
||||
flashes:
|
||||
config:
|
||||
notice:
|
||||
|
|
|
|||
|
|
@ -445,6 +445,9 @@ user:
|
|||
# delete_confirm: Are you sure?
|
||||
# back_to_list: Back to list
|
||||
|
||||
error:
|
||||
# page_title: An error occurred
|
||||
|
||||
flashes:
|
||||
config:
|
||||
notice:
|
||||
|
|
|
|||
|
|
@ -445,6 +445,9 @@ user:
|
|||
delete_confirm: Jesteś pewien?
|
||||
back_to_list: Powrót do listy
|
||||
|
||||
error:
|
||||
# page_title: An error occurred
|
||||
|
||||
flashes:
|
||||
config:
|
||||
notice:
|
||||
|
|
|
|||
|
|
@ -445,6 +445,9 @@ user:
|
|||
# delete_confirm: Are you sure?
|
||||
# back_to_list: Back to list
|
||||
|
||||
error:
|
||||
# page_title: An error occurred
|
||||
|
||||
flashes:
|
||||
config:
|
||||
notice:
|
||||
|
|
|
|||
|
|
@ -444,6 +444,9 @@ user:
|
|||
# delete_confirm: Are you sure?
|
||||
# back_to_list: Back to list
|
||||
|
||||
error:
|
||||
# page_title: An error occurred
|
||||
|
||||
flashes:
|
||||
config:
|
||||
notice:
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<meta name="twitter:image" content="{{ picturePath }}" />
|
||||
<meta name="twitter:site" content="@wallabagapp" />
|
||||
<meta name="twitter:title" content="{{ entry.title | raw }}" />
|
||||
<meta name="twitter:description" content="{{ entry.title | raw }}" />
|
||||
<meta name="twitter:description" content="{{ entry.content|striptags|slice(0, 300)|raw }}…" />
|
||||
</head>
|
||||
<body>
|
||||
<header>
|
||||
|
|
|
|||
|
|
@ -138,8 +138,11 @@ class WallabagExtension extends \Twig_Extension implements \Twig_Extension_Globa
|
|||
$interval = $user->getCreatedAt()->diff(new \DateTime('now'));
|
||||
$nbDays = (int) $interval->format('%a') ?: 1;
|
||||
|
||||
// force setlocale for date translation
|
||||
setlocale(LC_TIME, strtolower($user->getConfig()->getLanguage()).'_'.strtoupper(strtolower($user->getConfig()->getLanguage())));
|
||||
|
||||
return $this->translator->trans('footer.stats', [
|
||||
'%user_creation%' => $user->getCreatedAt()->format('F jS, Y'),
|
||||
'%user_creation%' => strftime('%e %B %Y', $user->getCreatedAt()->getTimestamp()),
|
||||
'%nb_archives%' => $nbArchives,
|
||||
'%per_day%' => round($nbArchives / $nbDays, 2),
|
||||
]);
|
||||
|
|
|
|||
|
|
@ -50,9 +50,10 @@ abstract class AbstractConsumer
|
|||
$entry = $this->import->parseEntry($storedEntry);
|
||||
|
||||
if (null === $entry) {
|
||||
$this->logger->warning('Unable to parse entry', ['entry' => $storedEntry]);
|
||||
$this->logger->warning('Entry already exists', ['entry' => $storedEntry]);
|
||||
|
||||
return false;
|
||||
// return true to skip message
|
||||
return true;
|
||||
}
|
||||
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -139,12 +139,24 @@ abstract class BrowserImport extends AbstractImport
|
|||
public function parseEntry(array $importedEntry)
|
||||
{
|
||||
if ((!array_key_exists('guid', $importedEntry) || (!array_key_exists('id', $importedEntry))) && is_array(reset($importedEntry))) {
|
||||
if ($this->producer) {
|
||||
$this->parseEntriesForProducer($importedEntry);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$this->parseEntries($importedEntry);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if (array_key_exists('children', $importedEntry)) {
|
||||
if ($this->producer) {
|
||||
$this->parseEntriesForProducer($importedEntry['children']);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$this->parseEntries($importedEntry['children']);
|
||||
|
||||
return;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue