Commit 40d1faf3 authored by Emma's avatar Emma 🏳🌈

rename inbox to notifications, icon in site nav

parent 2f7305fd
Pipeline #52616657 passed with stages
in 8 minutes and 16 seconds
......@@ -40,7 +40,7 @@
display: block;
&--has-notifications {
background: var(--fg-orange); // todo
background: var(--notification);
}
// todo: BEM
......@@ -75,7 +75,7 @@
&__mobile-toggle {
&--has-notifications {
background: var(--fg-orange); // todo
background: var(--notification);
}
}
......@@ -91,7 +91,7 @@
&__item {
&--has-notifications {
background: var(--fg-orange); // todo
background: var(--notification);
}
&.dropdown-container {
......
......@@ -24,6 +24,8 @@
--card: var(--bg-page);
--sidebar-card: #010;
--notification: #f80;
--bg-red: #660000;
--bg-orange: #663500;
--bg-green: #004200;
......
......@@ -24,6 +24,8 @@
--card: var(--bg-page);
--sidebar-card: #efe;
--notification: #f80;
--bg-red: #fdd;
--bg-orange: #fed;
--bg-green: #dfd;
......
......@@ -161,6 +161,24 @@
"css": "attention",
"code": 59409,
"src": "fontawesome"
},
{
"uid": "f89739d9df5c9e70ece9be9cdf66abb6",
"css": "envelope-open",
"code": 62134,
"src": "fontawesome"
},
{
"uid": "ccc2329632396dc096bb638d4b46fb98",
"css": "envelope",
"code": 61664,
"src": "fontawesome"
},
{
"uid": "57ae6bdecc7044555daa84354a8dfe49",
"css": "envelope-open-o",
"code": 62135,
"src": "fontawesome"
}
]
}
\ No newline at end of file
......@@ -80,17 +80,24 @@ mark_user_untrusted:
path: /user/{username}/mark_as_untrusted
methods: [POST]
inbox:
controller: App\Controller\UserController::inbox
defaults: { page: 1 }
inbox: # legacy redirect
controller: Symfony\Bundle\FrameworkBundle\Controller\RedirectController::redirectAction
defaults: { page: 1, route: notifications }
path: /inbox/{page}
methods: [GET]
requirements: { page: \d+ }
clear_inbox:
controller: App\Controller\UserController::clearInbox
notifications:
controller: App\Controller\UserController::notifications
defaults: { page: 1 }
path: /notifications/{page}
methods: [GET]
requirements: { page: \d+ }
clear_notifications:
controller: App\Controller\UserController::clearNotifications
defaults: { _format: html }
path: /clear_inbox.{_format}
path: /clear_notifications.{_format}
methods: [POST]
requirements: { _format: html|json }
......
......@@ -2,6 +2,7 @@
"private": true,
"devDependencies": {
"@symfony/webpack-encore": "^0.24.0",
"font-blast": "^0.7.0",
"fontello-cli": "git+https://git@gitlab.com/postmill/fontello-cli.git",
"less": "^3.9.0",
"less-loader": "^4.1.0",
......
......@@ -337,11 +337,11 @@ final class UserController extends AbstractController {
*
* @return Response
*/
public function inbox(int $page) {
public function notifications(int $page) {
/* @var User $user */
$user = $this->getUser();
return $this->render('user/inbox.html.twig', [
return $this->render('user/notifications.html.twig', [
'notifications' => $user->getPaginatedNotifications($page),
]);
}
......@@ -356,22 +356,22 @@ final class UserController extends AbstractController {
*
* @return Response
*/
public function clearInbox(Request $request, NotificationRepository $nr, EntityManager $em, string $_format) {
$this->validateCsrf('clear_inbox', $request->request->get('token'));
public function clearNotifications(Request $request, NotificationRepository $nr, EntityManager $em, string $_format) {
$this->validateCsrf('clear_notifications', $request->request->get('token'));
$user = $this->getUser();
$max = $request->query->getInt('max', null);
$nr->clearInbox($user, $max);
$nr->clearNotifications($user, $max);
$em->flush();
if ($_format === 'json') {
return $this->json(['message' => 'The inbox was successfully cleared.']);
return $this->json(['message' => 'The notifications were successfully cleared.']);
}
$this->addFlash('notice', 'flash.inbox_cleared');
$this->addFlash('notice', 'flash.notifications_cleared');
return $this->redirectToRoute('inbox');
return $this->redirectToRoute('notifications');
}
/**
......@@ -399,7 +399,7 @@ final class UserController extends AbstractController {
$this->addFlash('notice', 'flash.notification_cleared');
return $this->redirectToRoute('inbox');
return $this->redirectToRoute('notifications');
}
/**
......
......@@ -18,7 +18,7 @@ class NotificationRepository extends ServiceEntityRepository {
*
* @return int numbers of rows cleared
*/
public function clearInbox(User $user, int $max = null) {
public function clearNotifications(User $user, int $max = null) {
$qb = $this->getEntityManager()->createQueryBuilder()
->delete(Notification::class, 'n')
->where('n.user = ?1')
......@@ -43,7 +43,7 @@ class NotificationRepository extends ServiceEntityRepository {
->where('n.user = ?1')
->setParameter(1, $user)
->andWhere('n.id = ?2')
->setparameter(2, $notificationId);
->setParameter(2, $notificationId);
return $qb->getQuery()->execute();
}
......
......@@ -9,6 +9,9 @@
<symbol id="comment" viewBox="0 0 1000 1000"><path d="M1000 500q0 97-67 179T751 809t-251 48q-39 0-81-4-110 97-257 135-27 8-63 12-10 1-17-5t-10-16v-1q-2-2 0-6t1-6 2-5l4-5 4-5 4-5q4-5 17-19t20-22 17-22 18-28 15-33 15-42q-88-50-138-123T0 500q0-73 40-139t106-114 160-76 194-28q136 0 251 48t182 130 67 179z"/></symbol>
<symbol id="down" viewBox="0 0 928 1000"><path d="M911 499L464 947 18 499l158-158 177 176V53h223v464l176-175z"/></symbol>
<symbol id="ellipsis-vert" viewBox="0 0 214.3 1000"><path d="M214 696v108q0 22-15 37t-38 16H54q-23 0-38-16T0 804V696q0-22 16-38t38-15h107q22 0 38 15t15 38zm0-285v107q0 22-15 38t-38 15H54q-23 0-38-15T0 518V411q0-23 16-38t38-16h107q22 0 38 16t15 38zm0-286v107q0 22-15 38t-38 16H54q-23 0-38-16T0 232V125q0-22 16-38t38-16h107q22 0 38 16t15 38z"/></symbol>
<symbol id="envelope-open-o" viewBox="0 0 1000 1000"><path d="M823 509l21 29q5 6 4 13t-6 11q-24 19-71 55t-82 63-37 29q-22 18-34 27t-33 23-43 20-41 7h-2q-20 0-41-7t-42-20-34-23-34-27q-3-2-36-28t-80-62-68-53q-7-4-7-11t3-13l21-29q4-6 12-7t14 3q52 41 170 132 3 2 25 20t33 26 32 18 32 9h2q13 0 32-9t32-18 34-26 24-20q144-110 174-135 7-4 14-4t12 7zm106 402V393q-51-47-89-78-51-41-217-169-2-2-24-20t-34-27-31-18-33-10h-2q-13 0-32 10t-32 18-34 27-24 20q-120 92-176 137t-72 58-46 41q-8 7-12 11v518q0 7 6 12t12 6h822q7 0 12-6t6-12zm71-518v518q0 37-26 63t-63 26H89q-36 0-63-26T0 911V393q0-31 23-53 69-63 195-162T348 77q20-17 33-27t35-23 42-20 41-7h2q20 0 41 7t43 20 34 23 33 27q24 20 87 68t126 99 112 96q23 22 23 53z"/></symbol>
<symbol id="envelope-open" viewBox="0 0 1000 1000"><path d="M1000 365v546q0 37-26 63t-63 26H89q-36 0-63-26T0 911V365q0-8 6-13 5-4 22-20t23-20 26-21 39-31 53-40 80-60 108-79q2-2 29-22t40-29 36-20 38-10 39 10 36 20 39 29 29 22q62 45 108 79t80 60 54 40 39 31 25 21 23 20 22 20q6 5 6 13zM685 691q147-106 193-140 6-5 7-12t-4-13l-21-29q-4-6-12-7t-13 4q-129 94-192 139-2 2-29 22t-39 29-36 20-39 10-38-10-36-20-40-29-29-22q-104-74-192-139-6-5-13-4t-12 7l-21 29q-5 6-4 13t7 12q46 34 193 140 5 5 28 22t36 26 36 22 43 19 42 6 42-6 44-20 36-22 37-26 26-21z"/></symbol>
<symbol id="envelope" viewBox="0 0 1000 1000"><path d="M1000 396v443q0 37-26 63t-63 27H89q-36 0-63-27T0 839V396q25 27 56 49 202 137 278 192 32 24 51 37t53 27 61 13h2q28 0 61-13t53-27 51-37q95-68 278-192 32-22 56-49zm0-164q0 44-27 84t-68 69Q695 531 643 566q-5 4-23 17t-30 22-29 18-32 15-28 5h-2q-12 0-27-5t-32-15-30-18-30-22-23-17q-51-35-147-101T96 385q-35-23-65-64T0 244q0-43 23-72t66-29h822q36 0 63 26t26 63z"/></symbol>
<symbol id="forward" viewBox="0 0 1000 1000"><path d="M1000 357q0 15-11 25L704 668q-11 11-25 11t-25-11-11-25V500H518q-55 0-98 3t-86 12-74 24-59 39-45 56-27 77-10 101q0 31 3 69 0 4 2 13t1 15q0 8-5 14t-13 6q-9 0-15-10-4-5-8-12t-7-17-6-13Q0 718 0 625q0-111 30-186 90-225 488-225h125V71q0-14 11-25t25-10 25 10l285 286q11 11 11 25z"/></symbol>
<symbol id="hammer" viewBox="0 0 1000 1000"><path d="M988 857q0 30-20 50l-60 61q-22 20-51 20t-50-20L604 764q-21-20-21-50 0-29 24-53L464 518l-70 70q-8 8-19 8t-19-8l7 7 7 7 6 6q5 5 5 8t4 8 3 9 0 10q0 21-15 38-2 1-9 10t-11 11-10 9-13 9-12 5-14 3q-23 0-38-16L38 484q-16-15-16-38 0-7 3-14t5-12 9-13 9-10 11-11 10-9q17-15 38-15h10q4 0 9 3t8 4 8 5 6 6 7 7 7 7q-8-8-8-19t8-19l194-194q8-8 19-8t19 8l-7-7-7-7q-1-1-6-7t-5-7-3-8-4-9 0-10q0-21 15-38 2-2 9-10t11-11 10-10 13-8 12-5 14-3q23 0 38 16l228 228q16 15 16 38 0 7-3 14t-5 12-8 13-10 10-11 11-10 9q-17 15-38 15h-10q-4 0-9-4t-8-3-7-5-7-6-7-7-7-7q8 8 8 19t-8 19l-70 70 143 143q24-24 53-24t51 21l203 202q20 22 20 51z"/></symbol>
<symbol id="hashtag" viewBox="0 0 1000 1000"><path d="M553 571l36-142H447l-36 142h142zm429-281l-32 125q-4 14-17 14H751l-36 142h173q9 0 14 7 6 8 4 16l-32 125q-2 13-17 13H675l-45 183q-4 14-18 14H487q-9 0-14-7t-4-16l44-174H371l-45 183q-4 14-17 14H183q-8 0-14-7-5-7-3-16l43-174H36q-9 0-14-7-5-6-4-15l32-125q4-14 17-14h182l36-142H112q-9 0-14-7-6-8-4-16l32-125q2-13 17-13h182l46-183q3-14 17-14h125q9 0 14 7t4 16l-44 174h142l45-183q4-14 18-14h125q8 0 14 7 5 7 3 16l-43 174h173q9 0 14 7 5 6 4 15z"/></symbol>
......
......@@ -49,11 +49,13 @@
<a href="{{ path('registration') }}" class="site-nav__link">{{ 'nav.register'|trans }}</a>
</li>
{% else %}
{# notifications #}
{% if notification_count > 0 %}
<li class="site-nav__item site-nav__item--has-notifications">
<a href="{{ path('inbox') }}" class="site-nav__link">
{{- 'nav.inbox_count'|trans({'%count%': '<strong>%s</strong>'|format(notification_count|localizednumber)})|raw -}}
<a href="{{ path('notifications') }}"
class="site-nav__link no-underline"
title="{{ 'nav.notifications_count'|trans({'%count%': notification_count|localizednumber}) }}">
{{ icon('envelope-open') }}
<small class="no-underline__exempt" aria-hidden="true">{{ notification_count|localizednumber }}</small>
</a>
</li>
{% endif %}
......
......@@ -9,6 +9,8 @@
{% block title 'title.messages'|trans %}
{% block body %}
{{ include('user/_inbox_nav.html.twig', { active: 'messages' }, with_context=false) }}
<h1 class="page-heading">{{ block('title') }}</h1>
{% if messages|length > 0 %}
......
<nav class="tabs">
<ul class="tabs__bar">
<ul class="tabs__bar unlistify">
{% with { active: current_page == 'css' } %}
<li class="tabs__tab {{ active ? 'tabs__tab--active' }}">
<a href="{{ path('edit_theme_css', { username: theme.author.username, name: theme.name }) }}"
......
{% set links = {
notifications: { path: path('notifications'), label: 'nav.notifications'|trans },
messages: { path: path('message_list'), label: 'nav.messages'|trans },
} %}
<nav class="tabs">
<ul class="tabs__bar unlistify">
{% for name, link in links %}
<li class="tabs__tab {{ active == name ? 'tabs_tab--active' }}">
<a href="{{ link.path }}" class="tab tabs__link {{ active == name ? 'tab--active tabs__link--active' }}">
{{- link.label -}}
</a>
</li>
{% endfor %}
</ul>
</nav>
{% extends 'base.html.twig' %}
{% block head %}
{{ parent() }}
{% include '_includes/meta_pagination.html.twig' with {pager: notifications} %}
{% endblock %}
{% block page_classes %}
inbox-page
{% endblock %}
{% block title %}
{{ 'inbox.title'|trans }}
{% endblock %}
{% block title 'title.notifications'|trans %}
{% block body %}
<h1 class="page-heading">{{ 'inbox.title'|trans }}</h1>
{{ include('user/_inbox_nav.html.twig', {active: 'notifications'}, with_context=false) }}
<h1 class="page-heading">{{ block('title') }}</h1>
{% if notifications|length > 0 %}
<form action="{{ path('clear_inbox', { max: notifications|first.id }) }}" method="POST" class="form">
<input type="hidden" name="token" value="{{ csrf_token('clear_inbox') }}">
<form action="{{ path('clear_notifications', { max: notifications|first.id }) }}" method="POST" class="form">
<input type="hidden" name="token" value="{{ csrf_token('clear_notifications') }}">
<div class="form__row">
<button type="submit" class="button">{{ 'inbox.clear_inbox'|trans }}</button>
<button type="submit" class="button">{{ 'action.clear_all'|trans }}</button>
</div>
</form>
{% else %}
<p class="no-entries">
<small class="dimmed">{{ 'inbox.empty'|trans }}</small>
<small class="dimmed">{{ 'flash.no_entries_to_display'|trans }}</small>
</p>
{% endif %}
......@@ -95,7 +92,7 @@
<form action="{{ path('clear_notification', { id: notification.id }) }}" method="POST">
<input type="hidden" name="token" value="{{ csrf_token('clear_notification') }}">
<div>
<button type="submit" class="clear-notification-button">Clear notification</button>
<button type="submit" class="clear-notification-button">{{ 'action.clear'|trans }}</button>
</div>
</form>
{% endblock %}
......@@ -153,7 +153,7 @@ class ApplicationAvailabilityTest extends WebTestCase {
yield ['/f/news/appearance'];
yield ['/f/news/add_moderator'];
yield ['/f/news/delete'];
yield ['/inbox'];
yield ['/notifications'];
yield ['/submit'];
yield ['/submit/news'];
yield ['/user/emma/block_list'];
......
......@@ -40,7 +40,7 @@ class UserControllerTest extends WebTestCase {
$client->submit($form);
$client = $this->createZachClient();
$crawler = $client->request('GET', '/inbox');
$crawler = $client->request('GET', '/notifications');
$this->assertContains(
'You will be notified about this comment.',
......@@ -59,7 +59,7 @@ class UserControllerTest extends WebTestCase {
$client->submit($form);
$client = $this->createZachClient();
$crawler = $client->request('GET', '/inbox');
$crawler = $client->request('GET', '/notifications');
$this->assertContains(
'You will be notified about this comment.',
......
......@@ -70,7 +70,6 @@ flash:
forum_deleted: Das Forum und alle Inhalte wurden gelöscht.
forum_updated: Die Änderungen wurden gespeichert.
forum_moderator_added: Dieser Benutzer wurde zum Moderator ernannt.
inbox_cleared: Der Posteingang wurde geleert.
reset_password_email_sent: Eine Anfrage zum Zurücksetzen des Passworts wurde an die angegebene Email Adresse gesendet
submission_deleted: Die Einreichung wurde gelöscht.
submission_edited: Die Einreichung wurde bearbeitet.
......@@ -117,11 +116,6 @@ front:
all: Alle
featured: Empfohlen
inbox:
title: Posteingang
clear_inbox: Posteingang leeren
empty: Der Posteingang ist leer.
label:
ip_address: IP Adresse
reason_for_banning: Grund für Sperrung
......@@ -149,7 +143,6 @@ nav:
my_account: Mein Account
user_settings: Einstellungen
forums: Foren
inbox_count: Posteingang (%count%)
next: Nächste
previous: Vorherige
......
......@@ -89,7 +89,6 @@ flash:
forum_deleted: Το φόρουμ και όλο το περιεχόμενό του έχουν αφαιρεθεί.
forum_updated: Οι αλλαγές έχουν αποθηκευτεί.
forum_moderator_added: Ο χρήστης έχει γίνει συντονιστής.
inbox_cleared: Το inbox εκκαθαρίστηκε.
reset_password_email_sent: Ένα μήνυμα επαναφοράς στάλθηκε στη διεύθυνση που καθορίσατε.
theme_created: Το φύλλο στυλ σας έχει δημιουργηθεί.
theme_updated: Το φύλλο στυλ σας έχει αναβαθμιστεί.
......@@ -183,9 +182,6 @@ help:
append_to_default_style: Αφήστε αυτό το στοιχείο εκτός εάν το CSS σας παρέχει ένα πλήρες φύλλο στυλ για ολόκληρη την ιστοσελίδα.
inbox:
title: Inbox
clear_inbox: Διαγράψτε το Inbox.
empty: Το inbox είναι άδειο.
message_reply_head: 'Re: %τίτλος%'
label:
......@@ -288,7 +284,6 @@ nav:
my_account: Ο λογαριασμός μου
user_settings: Προτιμήσεις χρήστη
forums: Φόρουμ
inbox_count: Inbox (%count%)
messages: Μηνύματα
wiki: Wiki
next: Επόμενο
......
......@@ -35,6 +35,8 @@ action:
search: Search
hide: Hide
unhide: Unhide
clear: Clear
clear_all: Clear all
add_moderator:
title: Add moderator to %forum%
......@@ -105,7 +107,6 @@ flash:
forum_deleted: The forum and all its contents have been deleted.
forum_updated: The changes have been saved.
forum_moderator_added: The user has been promoted to moderator.
inbox_cleared: The inbox was cleared.
notification_cleared: The notification was successfully cleared.
reset_password_email_sent: A reset email has been sent to the address you specified.
theme_created: Your theme has been created.
......@@ -138,6 +139,7 @@ flash:
webhook_edited: The webhook was edited successfully.
wiki_page_deleted: The wiki page has been deleted.
editing_credentials_of_other_user: You are editing the credentials of another user. This can prevent them from logging in.
notifications_cleared: Your notifications have been cleared.
forum:
moderators: Moderators
......@@ -217,9 +219,6 @@ help:
required_field: This field is required.
inbox:
title: Inbox
clear_inbox: Clear inbox
empty: The inbox is empty.
message_reply_head: 'Re: %title%'
item:
......@@ -360,7 +359,6 @@ nav:
user_settings: User settings
forums: Forums
comments: Recent comments
inbox_count: Inbox (%count%)
messages: Messages
wiki: Wiki
next: Next
......@@ -386,6 +384,8 @@ nav:
add_webhook: Add webhook
hidden_forums: Hidden forums
recent_comments: Recent comments
notifications: Notifications
notifications_count: 'Notifications (%count%)'
placeholder:
default: (default)
......@@ -509,6 +509,7 @@ title:
search_site: Search the site
search_forum: Search this forum
hidden_forums: Hidden forums
notifications: Notifications
user:
submissions: Submissions
......
......@@ -95,7 +95,6 @@ flash:
forum_deleted: La diskutejo kaj ties enhavo foriĝis.
forum_updated: La redaktoj konserviĝis.
forum_moderator_added: La uzanto fariĝis kontrolanto
inbox_cleared: La enirkesto vakiĝis.
notification_cleared: La avizo estis sukcese vakigita.
reset_password_email_sent: Restariga retletero sendiĝis al la adreso, kiun vi specifis.
theme_created: Via estoso estis ĵus kreita.
......@@ -193,9 +192,6 @@ help:
will_appear_in_the_url: Ĝi aperos en la URL
inbox:
title: Enirkesto
clear_inbox: Malplenigi enirkeston
empty: La enirkesto estas malplena.
message_reply_head: 'Re: %title%'
item:
......@@ -335,7 +331,6 @@ nav:
my_account: Mia konto
user_settings: Uzanto-agordoj
forums: Diskutejoj
inbox_count: Enirkesto (%count%)
messages: Mesaĝoj
wiki: Vikio
next: Sekva
......
......@@ -99,7 +99,6 @@ flash:
forum_deleted: El foro y todos sus contenidos han sido borrados.
forum_updated: Los cambios han sido guardados.
forum_moderator_added: La usuaria ha sido ascendida a moderadora.
inbox_cleared: La bandeja de entrada ha sido limpiada.
notification_cleared: La notificación fue eliminada exitosamente.
reset_password_email_sent: Un correo de recuperación ha sido enviado a la dirección que especificó.
theme_created: Tu tema ha sido creado.
......@@ -198,9 +197,6 @@ help:
will_appear_in_the_url: Aparecerá en la URL.
inbox:
title: Bandeja de entrada
clear_inbox: Limpiar bandeja
empty: Su bandeja de entrada esta vacía
message_reply_head: 'Re: %title%'
item:
......@@ -339,7 +335,6 @@ nav:
my_account: Mi cuenta
user_settings: Opciones de usuario
forums: Foros
inbox_count: Bandeja de Entrada (%count%)
messages: Mensajes
wiki: Wiki
next: Siguiente
......
......@@ -75,7 +75,6 @@ flash:
forum_deleted: Foorumi ja kaikki sen sisältö on poistettu.
forum_updated: Muutokset tallennettu.
forum_moderator_added: Käyttäjä on ylennetty moderaattoriksi.
inbox_cleared: Postilaatikko tyhjennetty.
reset_password_email_sent: Nollaussähköpostiviesti on lähetetty antamaasi osoitteeseen.
submission_deleted: Lisäys poistettu.
submission_edited: Lisäystä muokattu.
......@@ -132,9 +131,6 @@ front:
subscribed: Tilatut
inbox:
title: Postilaatikko
clear_inbox: Tyhjennä postilaatikko
empty: Postilaatikko on tyhjä.
message_reply_head: 'VS: %title%'
label:
......@@ -177,7 +173,6 @@ nav:
my_account: Tunnukseni
user_settings: Käyttäjäasetukset
forums: Foorumit
inbox_count: Postilaatikko (%count%)
messages: Viestit
wiki: Wiki
next: Seuraava
......
......@@ -101,7 +101,6 @@ flash:
forum_deleted: Le forum et son contenu a été supprimé.
forum_updated: Les changements ont été sauvegardés.
forum_moderator_added: L'utilisateur a été promu modérateur.
inbox_cleared: La boîte de réception a été vidée.
notification_cleared: La notification a été effacée avec succès.
reset_password_email_sent: Un courrier électronique pour réinitialiser votre compte à été envoyé à l'adresse spécifiée.
theme_created: Votre thème a été créé.
......@@ -201,9 +200,6 @@ help:
search_external_message: Votre requête sera redirigée vers DuckDuckGo.
inbox:
title: Boîte de réception
clear_inbox: Vider la boîte de réception
empty: La boîte de réception est vide.
message_reply_head: 'Re: %title%'
item:
......@@ -342,7 +338,6 @@ nav:
user_settings: Réglages
forums: Forums
comments: Commentaires récents
inbox_count: Boîte de réception (%count%)
messages: Messages
wiki: Wiki
next: Suivant
......
......@@ -73,7 +73,6 @@ flash:
forum_deleted: Forumet og all dets innhold har blitt slettet.
forum_updated: Endringene har blitt lagret.
forum_moderator_added: Brukeren har blitt lagt til som moderator.
inbox_cleared: Innboksen ble tømt.
user_account_registered: Din konto har blitt registrert.
reset_password_email_sent: En epost har blitt sendt til adressen du oppga.
theme_created: Temaet ditt har blitt opprettet.
......@@ -132,9 +131,6 @@ front:
subscribed: Abonnert
inbox:
title: Innboks
clear_inbox: Tøm innboks
empty: Innboksen er tom.
message_reply_head: 'Sv: %title%'
label:
......@@ -176,7 +172,6 @@ nav:
my_account: Min brukerkonto
user_settings: Brukerinnstillinger
forums: Forumliste
inbox_count: Innboks (%count%)
messages: Meldinger
next: Neste
previous: Forrige
......
......@@ -74,7 +74,6 @@ flash:
forum_deleted: Het forum en al zijn inhoud zijn verwijderd.
forum_updated: De veranderingen zijn opgeslagen.
forum_moderator_added: De gebruiker is bevorderd tot moderator.
inbox_cleared: Je inbox is leeggemaakt.
reset_password_email_sent: Een e-mail met een link is gestuurd naar het e-mailadres dat je hebt opgegeven.
submission_deleted: De inzending is verwijderd.
submission_edited: De inzending is bewerkt.
......@@ -127,9 +126,6 @@ front:
featured: Uitgelicht
inbox:
title: Inbox
clear_inbox: Maak inbox leeg
empty: Je hebt geen nieuwe berichten.
message_reply_head: 'Antw.: %title'
label:
......@@ -166,7 +162,6 @@ nav:
my_account: Mijn account
user_settings: Gebruikersinstellingen
forums: Fora
inbox_count: Inbox (%count%)
next: Volgende
previous: Vorige
......
......@@ -87,7 +87,6 @@ flash:
forum_deleted: O fórum e todo o seu conteúdo foi apagado.
forum_updated: As alterações foram salvas.
forum_moderator_added: O usuário foi promovido a moderador.
inbox_cleared: A caixa de entrada foi limpa.
reset_password_email_sent: Um email de recuperação foi enviado ao enderço que você especificou.
theme_created: Seu tema foi criado.
theme_updated: O tema foi atualizado.
......@@ -179,9 +178,6 @@ help:
append_to_default_style_inheritance_warning: Ativar isto não tem nehum efeito ao extender um tema existente.
inbox:
title: Caixa de entrada
clear_inbox: Limpar caixa de entrada
empty: Caixa de entrada vazia.
message_reply_head: 'Re: %title%'
label:
......@@ -279,7 +275,6 @@ nav:
my_account: Minha conta
user_settings: Cofigurações de usuário
forums: Fórums
inbox_count: Caixa de entrada (%count%)
messages: Mensagens
wiki: Wiki
next: Próximo
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment