eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

[I18N] Fix use of string concatenations in translations

Browse Source
This commit is contained in:
Hugo Sales 2022-03-05 13:53:24 +00:00 committed by Diogo Peralta Cordeiro
parent 3f14ad0f69
commit 46c91a4b39
Signed by: diogo
GPG Key ID: 18D2D35001FBFAB0
7 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/Person/Controller/PersonFeed.php
View File

@ -80,7 +80,7 @@ class PersonFeed extends FeedController
'actor' => $person, 'actor' => $person,
'nickname' => $person->getNickname(), 'nickname' => $person->getNickname(),
'notes' => E\Note::getAllNotesByActor($person), 'notes' => E\Note::getAllNotesByActor($person),
'page_title' => _m($person->getNickname() . '\'s profile'), 'page_title' => _m('{nickname}\'s profile', ['{nickname}' => $person->getNickname()]),
'notes_feed_title' => (new Heading(level: 2, classes: ['section-title'], text: 'Notes by ' . $person->getNickname())), 'notes_feed_title' => (new Heading(level: 2, classes: ['section-title'], text: 'Notes by ' . $person->getNickname())),
]; ];
} }

6
templates/attachment/view.html.twig
View File

@ -2,8 +2,8 @@
{% block body %} {% block body %}
<section class="frame-section frame-section-padding"> <section class="frame-section frame-section-padding">
<h1>{{ 'Attachment' | trans }} {{ title }}</h1> <h1>{% trans %}Attachment %title%{% endtrans %}</h1>
{% include '/cards/blocks/attachment.html.twig' with {'attachment': attachment, 'note': note, 'title': title} only %} {% include '/cards/blocks/attachment.html.twig' with {'attachment': attachment, 'note': note, 'title': title} only %}
<a class="frame-section-button-like" href="{{ download }}"> {{ 'Original attachment link' | trans }}</a> <a class="frame-section-button-like" href="{{ download }}">{% trans %}Original attachment link{% endtrans %}</a>
</section> </section>
{% endblock body %} {% endblock body %}

12
templates/base.html.twig
View File

@ -44,10 +44,10 @@
<body> <body>
<aside class="accessibility-menu"> <aside class="accessibility-menu">
<strong class="accessibility-menu-title" tabindex="0">{{ 'Accessibility menu' | trans }}</strong> <strong class="accessibility-menu-title" tabindex="0">{% trans %}Accessibility menu{% endtrans %}</strong>
<br> <br>
<section tabindex="0"> <section tabindex="0">
<p>{{ 'Here you can find fast shortcuts to various page regions!' | trans }}</p> <p>{% trans %}Here you can find fast shortcuts to various page regions!{% endtrans %}</p>
<br> <br>
<p>{% trans %}Be mindful that a <em><kbd>Tab</kbd></em> followed by a <em><kbd>Space</kbd></em> is needed in order to focus each panel. Other anchors do only require a <em><kbd>Tab</kbd></em> however.{% endtrans %}</p> <p>{% trans %}Be mindful that a <em><kbd>Tab</kbd></em> followed by a <em><kbd>Space</kbd></em> is needed in order to focus each panel. Other anchors do only require a <em><kbd>Tab</kbd></em> however.{% endtrans %}</p>
</section> </section>
@ -90,9 +90,9 @@
<div class="header-instance"> <div class="header-instance">
<a id="anchor-main-page" class="anchor-hidden" <a id="anchor-main-page" class="anchor-hidden"
title="{{ 'Press tab to access instance\'s main page.' | trans }}"></a> title="{% trans %}Press tab to access instance's main page{% endtrans %}"></a>
<a class="accessibility-target" href="{{ path('feed_public') }}" tabindex="0" <a class="accessibility-target" href="{{ path('feed_public') }}" tabindex="0"
title="{{ 'This instance\'s name. Access public feed.' | trans }}"> title="{% trans %}This instance\'s name. Access public feed{% endtrans %}">
<h1>{{ icon('logo', 'icon icon-logo') | raw }}{{ config('site', 'name') }}</h1> <h1>{{ icon('logo', 'icon icon-logo') | raw }}{{ config('site', 'name') }}</h1>
</a> </a>
</div> </div>
@ -102,8 +102,8 @@
{% endblock header %} {% endblock header %}
<a role="navigation" rel="help" id="anchor-main-content" class="anchor-hidden" <a role="navigation" rel="help" id="anchor-main-content" class="anchor-hidden"
title="{{ 'Anchor to main content' | trans }}"></a> title="{% trans %}Anchor to main content{% endtrans %}"></a>
<main class="page-content-wrapper" title="{{ 'Page main content' | trans }}"> <main class="page-content-wrapper" title="{% trans %}Page main content{% endtrans %}">
<div class='page-content accessibility-target' role="presentation"> <div class='page-content accessibility-target' role="presentation">
{% block nav %}{% endblock %} {% block nav %}{% endblock %}
{% block body %}{% endblock %} {% block body %}{% endblock %}

3
templates/note/view.html.twig
View File

@ -1,7 +1,8 @@
{% extends 'stdgrid.html.twig' %} {% extends 'stdgrid.html.twig' %}
{% import '/cards/macros/note/factory.html.twig' as NoteFactory %} {% import '/cards/macros/note/factory.html.twig' as NoteFactory %}
{% block title %}{{ note.getActorNickname() ~ '\'s note' | trans }}{% endblock %} {% set nickname = note.getActorNickname() %}
{% block title %}{% trans %}%nickname%'s note{% endtrans %}{% endblock %}
{% block stylesheets %} {% block stylesheets %}
{{ parent() }} {{ parent() }}

18
templates/security/login.html.twig
View File

@ -1,13 +1,13 @@
{% extends 'stdgrid.html.twig' %} {% extends 'stdgrid.html.twig' %}
{% block title %}{{ "Log in!" | trans }}{% endblock %} {% block title %}{% trans %}Log in!{% endtrans %}{% endblock %}
{% block body %} {% block body %}
<section class="frame-section"> <section class="frame-section">
<form class="section-form" method="post"> <form class="section-form" method="post">
<fieldset class="container-block"> <fieldset class="container-block">
<legend class="section-form-legend"> <legend class="section-form-legend">
<h1>{{ "Login" | trans }}</h1> <h1>{% trans %}Login{% endtrans %}</h1>
</legend> </legend>
{% if error %} {% if error %}
@ -18,26 +18,26 @@
{% if app.user %} {% if app.user %}
<span> <span>
{{ "You are logged in as" | trans }} {{ app.user.username }}. {% trans %}You are logged in as %app.user.username%{% endtrans %}
<button class="btn btn-lg btn-primary"> <button class="btn btn-lg btn-primary">
<a href="{{ path('app_logout') }}">{{ "Logout" | trans }}</a> <a href="{{ path('app_logout') }}">{% trans %}Logout{% endtrans %}</a>
</button> </button>
</span> </span>
{% else %} {% else %}
<div class="form-row"> <div class="form-row">
<label class="section-form-label" for="inputNicknameOrEmail">{{ "Nickname or Email" | trans }}</label> <label class="section-form-label" for="inputNicknameOrEmail">{% trans %}Nickname or Email{% endtrans %}</label>
<input type="text" value="{{ last_login_id }}" name="_username" id="inputNicknameOrEmail" class="form-control" required autofocus> <input type="text" value="{{ last_login_id }}" name="_username" id="inputNicknameOrEmail" class="form-control" required autofocus>
<p class="help-text">{{ "Your nickname or email address." | trans }}</p> <p class="help-text">{% trans %}Your nickname or email address{% endtrans %}</p>
</div> </div>
<div class="form-row"> <div class="form-row">
<label class="section-form-label" for="inputPassword">{{ "Password" | trans }}</label> <label class="section-form-label" for="inputPassword">{% trans %}Password{% endtrans %}</label>
<input type="password" name="_password" id="inputPassword" class="form-control" required> <input type="password" name="_password" id="inputPassword" class="form-control" required>
<p class="help-text">{{ "Your account's password." | trans }}</p> <p class="help-text">{% trans %}Your account's password{% endtrans %}</p>
</div> </div>
<span class="form-row-checkbox"> <span class="form-row-checkbox">
<label for="inputRememberMe">{{ "Remember me" | trans }}</label> <label for="inputRememberMe">{% trans %}Remember me{% endtrans %}</label>
<input type="checkbox" name="_remember_me" id="inputRememberMe"> <input type="checkbox" name="_remember_me" id="inputRememberMe">
</span> </span>

4
templates/security/register.html.twig
View File

@ -1,6 +1,6 @@
{% extends 'stdgrid.html.twig' %} {% extends 'stdgrid.html.twig' %}
{% block title %}Register{% endblock %} {% block title %}{% trans %}Register{% endtrans %}{% endblock %}
{% block body %} {% block body %}
<section class="frame-section"> <section class="frame-section">
@ -9,7 +9,7 @@
{{ form_errors(registration_form) }} {{ form_errors(registration_form) }}
<fieldset class="container-block"> <fieldset class="container-block">
<legend class="section-form-legend"> <legend class="section-form-legend">
<h1>{{ "Register" | trans }}</h1> <h1>{% trans %}Register{% endtrans %}</h1>
</legend> </legend>
{% for flashError in app.flashes('verify_email_error') %} {% for flashError in app.flashes('verify_email_error') %}

2
templates/settings/base.html.twig
View File

@ -2,7 +2,7 @@
{% import 'cards/macros/settings.html.twig' as macros %} {% import 'cards/macros/settings.html.twig' as macros %}
{% block title %}{{ 'Settings' | trans }}{% endblock %} {% block title %}{% trans %}Settings{% endtrans %}{% endblock %}
{% block body %} {% block body %}
<nav class='frame-section frame-section-padding'> <nav class='frame-section frame-section-padding'>