Merge pull request #10048 from MrPetovan/bug/10047-translation-back-to-top

Bug/10047 translation back to top
This commit is contained in:
Michael Vogel 2021-03-15 01:02:54 +01:00 committed by GitHub
commit 8e12bb2de5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 10 deletions

View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2021.03-rc\n" "Project-Id-Version: 2021.03-rc\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-03-14 13:43-0400\n" "POT-Creation-Date: 2021-03-14 18:14-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -3620,11 +3620,11 @@ msgstr ""
msgid "Site map" msgid "Site map"
msgstr "" msgstr ""
#: src/Content/OEmbed.php:270 #: src/Content/OEmbed.php:269
msgid "Embedding disabled" msgid "Embedding disabled"
msgstr "" msgstr ""
#: src/Content/OEmbed.php:388 #: src/Content/OEmbed.php:387
msgid "Embedded content" msgid "Embedded content"
msgstr "" msgstr ""
@ -10782,10 +10782,14 @@ msgstr ""
msgid "Leave background image and color empty for theme defaults" msgid "Leave background image and color empty for theme defaults"
msgstr "" msgstr ""
#: view/theme/frio/php/default.php:81 view/theme/frio/php/standard.php:38 #: view/theme/frio/php/default.php:81 view/theme/frio/php/standard.php:40
msgid "Skip to main content" msgid "Skip to main content"
msgstr "" msgstr ""
#: view/theme/frio/php/default.php:152 view/theme/frio/php/standard.php:75
msgid "Back to top"
msgstr ""
#: view/theme/frio/php/Image.php:40 #: view/theme/frio/php/Image.php:40
msgid "Top Banner" msgid "Top Banner"
msgstr "" msgstr ""

View file

@ -149,7 +149,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
</div><!--row--> </div><!--row-->
</div><!-- container --> </div><!-- container -->
<div id="back-to-top" title="back to top"></div> <div id="back-to-top" title="<?php echo DI::l10n()->t('Back to top')?>"></div>
</main> </main>
<footer> <footer>

View file

@ -20,6 +20,8 @@
* The default site template * The default site template
*/ */
use Friendica\DI;
?> ?>
<!DOCTYPE html > <!DOCTYPE html >
<html> <html>
@ -27,9 +29,9 @@
<title><?php if(!empty($page['title'])) echo $page['title'] ?></title> <title><?php if(!empty($page['title'])) echo $page['title'] ?></title>
<meta name="viewport" content="initial-scale=1.0"> <meta name="viewport" content="initial-scale=1.0">
<meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?>"> <meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?>">
<script type="text/javascript">var baseurl="<?php echo Friendica\DI::baseUrl() ?>";</script> <script type="text/javascript">var baseurl="<?php echo DI::baseUrl() ?>";</script>
<script type="text/javascript">var frio="<?php echo "view/theme/frio"; ?>";</script> <script type="text/javascript">var frio="<?php echo "view/theme/frio"; ?>";</script>
<?php $baseurl = Friendica\DI::baseUrl(); ?> <?php $baseurl = DI::baseUrl(); ?>
<?php $frio = "view/theme/frio"; ?> <?php $frio = "view/theme/frio"; ?>
<?php if(!empty($page['htmlhead'])) echo $page['htmlhead']; ?> <?php if(!empty($page['htmlhead'])) echo $page['htmlhead']; ?>
</head> </head>
@ -38,8 +40,8 @@
<a href="#content" class="sr-only sr-only-focusable"><?php echo DI::l10n()->t('Skip to main content'); ?></a> <a href="#content" class="sr-only sr-only-focusable"><?php echo DI::l10n()->t('Skip to main content'); ?></a>
<?php <?php
if(!empty($page['nav'])) { if(!empty($page['nav'])) {
echo str_replace("~config.sitename~",Friendica\DI::config()->get('config','sitename'), echo str_replace("~config.sitename~", DI::config()->get('config','sitename'),
str_replace("~system.banner~",Friendica\DI::config()->get('system','banner'), str_replace("~system.banner~", DI::config()->get('system','banner'),
$page['nav'] $page['nav']
));}; ));};
?> ?>
@ -70,7 +72,7 @@
</div><!--row--> </div><!--row-->
</div><!-- container --> </div><!-- container -->
<div id="back-to-top" title="back to top"></div> <div id="back-to-top" title="<?php echo DI::l10n()->t('Back to top')?>"></div>
</main> </main>
<footer> <footer>