Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1788 from yfdyh000/messages_210822

Browse source
This commit is contained in:
ArthurHoaro 2022-08-13 10:11:21 +02:00 committed by GitHub
commit 22d43c303b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
application/front/controller/admin/ShaarliAdminController.php
View file

@ -59,7 +59,7 @@ protected function saveErrorMessage(string $message): void
/**
* Use the sessionManager to save the provided message using the proper type.
*
* @param string $type successed/warnings/errors
* @param string $type successes/warnings/errors
*/
protected function saveMessage(string $type, string $message): void
{

2
application/security/SessionManager.php
View file

@ -256,7 +256,7 @@ public function setSessionParameter(string $key, $value): self
}
/**
* Store a variable in user session.
* Delete a variable in user session.
*
* @param string $key Session key
*

4
doc/md/Backup-and-restore.md
View file

@ -6,6 +6,6 @@ All data and [configuration](Shaarli-configuration.md) is kept in the `data` dir
rsync -avzP my.server.com:/var/www/shaarli.mydomain.org/data ~/backups/shaarli-data-$(date +%Y-%m-%d_%H%M)
```
It is strongly recommended to do periodic, automatic backups to a seperate machine. You can automate the command above using a cron job or full-featured backup solutions such as [rsnapshot](https://rsnapshot.org/)
It is strongly recommended to do periodic, automatic backups to a separate machine. You can automate the command above using a cron job or full-featured backup solutions such as [rsnapshot](https://rsnapshot.org/)
To restore a backup, simply put back the `data/` directory in place, owerwriting any existing files.
To restore a backup, simply put back the `data/` directory in place, overwriting any existing files.

1
doc/md/dev/Development.md
View file

@ -1,3 +1,4 @@
# Development
Please read [Contributing to Shaarli](https://github.com/shaarli/Shaarli/tree/master/CONTRIBUTING.md)

4
doc/md/dev/Unit-tests.md
View file

@ -40,7 +40,7 @@ zend_extension=xdebug.so
## Run unit tests
Ensure tests pass successuflly:
Ensure tests pass successfully:
```bash
make test
@ -110,7 +110,7 @@ Each image provides:
- Shaarli PHP dependencies (OS packages)
- test PHP dependencies (OS packages)
- Composer
- Tests that run inside the conatiner using a standard Linux user account (running tests as `root` would bypass permission checks and may hide issues)
- Tests that run inside the container using a standard Linux user account (running tests as `root` would bypass permission checks and may hide issues)
Build a test image:

2
plugins/wallabag/wallabag.php
View file

@ -69,7 +69,7 @@ function hook_wallabag_render_linklist($data, $conf)
function wallabag_dummy_translation()
{
// meta
t('For each link, add a QRCode icon.');
t("For each link, add a Wallabag icon to save it in your instance.");
t('Wallabag API URL');
t('Wallabag API version (1 or 2)');
}

8
tpl/default/configure.html
View file

@ -49,7 +49,7 @@ <h2 class="window-title">{'Configure'|t}</h2>
<div class="pure-u-lg-{$ratioLabel} pure-u-1">
<div class="form-label">
<label for="titleLink">
<span class="label-name">{'Theme'|t}</span>
<span class="label-name">{'Themes'|t}</span>
</label>
</div>
</div>
@ -95,7 +95,7 @@ <h2 class="window-title">{'Configure'|t}</h2>
<div class="pure-u-lg-{$ratioLabel} pure-u-1">
<div class="form-label">
<label for="language">
<span class="label-name">{'Language'|t}</span>
<span class="label-name">{'Languages'|t}</span>
</label>
</div>
</div>
@ -222,7 +222,7 @@ <h2 class="window-title">{'Configure'|t}</h2>
<div class="pure-u-lg-{$ratioLabel} pure-u-{$ratioLabelMobile}">
<div class="form-label">
<label for="updateCheck">
<span class="label-name">{'Check updates'|t}</span><br>
<span class="label-name">{'Check for updates'|t}</span><br>
<span class="label-desc">{'Notify me when a new release is ready'|t}</span>
</label>
</div>
@ -270,7 +270,7 @@ <h2 class="window-title">{'Configure'|t}</h2>
<div class="pure-u-lg-{$ratioLabel} pure-u-1">
<div class="form-label">
<label for="apiSecret">
<span class="label-name">{'API secret'|t}</span><br>
<span class="label-name">{'REST API secret'|t}</span><br>
</label>
</div>
</div>

4
tpl/default/install.html
View file

@ -69,7 +69,7 @@ <h2 class="window-title">{'Install Shaarli'|t}</h2>
<div class="pure-u-lg-{$ratioLabel} pure-u-1">
<div class="form-label">
<label for="language">
<span class="label-name">{'Language'|t}</span>
<span class="label-name">{'Languages'|t}</span>
</label>
</div>
</div>
@ -127,7 +127,7 @@ <h2 class="window-title">{'Install Shaarli'|t}</h2>
<div class="pure-u-lg-{$ratioLabel} pure-u-7-8">
<div class="form-label">
<label for="update">
<span class="label-name">{'Check updates'|t}</span><br>
<span class="label-name">{'Check for updates'|t}</span><br>
<span class="label-desc">
{'Notify me when a new release is ready'|t}
</span>

2
tpl/default/pluginsadmin.html
View file

@ -10,7 +10,7 @@
<div class="pure-g new-version-message pure-alert pure-alert-warning">
<div class="pure-u-2-24"></div>
<div class="pure-u-20-24">
{'You need to enable Javascript to change plugin loading order.'|t}
{'You have to enable JavaScript to change plugin loading order.'|t}
</div>
</div>
<div class="clear"></div>

2
tpl/default/tools.html
View file

@ -65,7 +65,7 @@ <h2 class="window-title">{'Settings'|t}</h2>
<div class="pure-g">
<div class="pure-u-lg-1-3 pure-u-1-24"></div>
<div class="pure-u-lg-1-3 pure-u-22-24 page-form page-form-light">
<h2 class="window-title">Bookmarklets</h2>
<h2 class="window-title">{'Bookmarklets'|t}</h2>
<p>
{'Drag one of these button to your bookmarks toolbar or right-click it and "Bookmark This Link"'|t},
{'then click on the bookmarklet in any page you want to share.'|t}