some more translation work

app/Http/Controllers/UserController.php

@@ -48,7 +48,7 @@ public function contactForm(User $user)
       ->with('user', $user);
     }
     else {
-      flash(_('This user did not verify his/her email so you cannot contact him/her'));
+      flash(__('This user did not verify his/her email so you cannot contact him/her'));
       return redirect()->back();
     }
   }
@@ -71,13 +71,13 @@ public function contact(User $user, Request $request)
         return redirect()->route('users.contactform', $to_user);
       }
       else {
-        flash(_('Please type a message'));
+        flash(__('Please type a message'));
         return redirect()->back();
       }
 
 
     } else {
-      flash(_('The user you are trying to contact did not verify his/her email'));
+      flash(__('The user you are trying to contact did not verify his/her email'));
       return redirect()->back();
     }
   }

localize

@@ -1 +1 @@
-php artisan localization:missing -n -b -c -d
+php artisan translatable:export fr,nl,de,es

resources/lang/de.json

@@ -1,7 +1,12 @@
 {
+    "This user did not verify his\/her email so you cannot contact him\/her": "This user did not verify his\/her email so you cannot contact him\/her",
+    "Please type a message": "Please type a message",
+    "The user you are trying to contact did not verify his\/her email": "The user you are trying to contact did not verify his\/her email",
+    "Filter": "Filter",
     "Homepage": "Homepage",
     "Latest discussions": "Latest discussions",
     "Calendar": "Calendar",
+    "Rename": "Rename",
     "This admin setting page is a work in progress. Some settings are not used yet (but all are saved for future use)": "This admin setting page is a work in progress. Some settings are not used yet (but all are saved for future use)",
     "Application name": "Application name",
     "The name of your application. Used everywhere, in titles, in emails, etc... Choose a short and catchy name": "The name of your application. Used everywhere, in titles, in emails, etc... Choose a short and catchy name",
@@ -19,11 +24,19 @@
     "Notify administrators when a new group is created": "Notify administrators when a new group is created",
     "Post by email": "Post by email",
     "Allow users to post by email": "Allow users to post by email",
+    "Show my groups": "Show my groups",
+    "Show all groups": "Show all groups",
+    "New": "New",
+    "Edit tags": "Edit tags",
     "Administer group": "",
     "Delete group": "",
     "Are you really sure you want to delete this groups and all it\\'s content?": "",
     "You are going to delete this group : ": "",
     "Altough this can be undone by an admin please make sure you want this groups to be deleted before clicking": "",
+    "Contact": "Contact",
+    "Use the form below to send an email directly to this user.": "Use the form below to send an email directly to this user.",
+    "Your message :": "Your message :",
+    "Reveal my email to this user so we can communicate by email": "Reveal my email to this user so we can communicate by email",
     "notifications.if_you_have_trouble": "",
     "notifications.clicking_the_button": "",
     "pagination.previous": "",

resources/lang/es.json

@@ -1,7 +1,12 @@
 {
+    "This user did not verify his\/her email so you cannot contact him\/her": "This user did not verify his\/her email so you cannot contact him\/her",
+    "Please type a message": "Please type a message",
+    "The user you are trying to contact did not verify his\/her email": "The user you are trying to contact did not verify his\/her email",
+    "Filter": "Filter",
     "Homepage": "Homepage",
     "Latest discussions": "Latest discussions",
     "Calendar": "Calendar",
+    "Rename": "Rename",
     "This admin setting page is a work in progress. Some settings are not used yet (but all are saved for future use)": "This admin setting page is a work in progress. Some settings are not used yet (but all are saved for future use)",
     "Application name": "Application name",
     "The name of your application. Used everywhere, in titles, in emails, etc... Choose a short and catchy name": "The name of your application. Used everywhere, in titles, in emails, etc... Choose a short and catchy name",
@@ -19,11 +24,19 @@
     "Notify administrators when a new group is created": "Notify administrators when a new group is created",
     "Post by email": "Post by email",
     "Allow users to post by email": "Allow users to post by email",
+    "Show my groups": "Show my groups",
+    "Show all groups": "Show all groups",
+    "New": "New",
+    "Edit tags": "Edit tags",
     "Administer group": "Administer group",
     "Delete group": "Delete group",
     "Are you really sure you want to delete this groups and all it\\'s content?": "Are you really sure you want to delete this groups and all it\\'s content?",
     "You are going to delete this group : ": "You are going to delete this group : ",
     "Altough this can be undone by an admin please make sure you want this groups to be deleted before clicking": "Altough this can be undone by an admin please make sure you want this groups to be deleted before clicking",
+    "Contact": "Contact",
+    "Use the form below to send an email directly to this user.": "Use the form below to send an email directly to this user.",
+    "Your message :": "Your message :",
+    "Reveal my email to this user so we can communicate by email": "Reveal my email to this user so we can communicate by email",
     "notifications.if_you_have_trouble": "notifications.if_you_have_trouble",
     "notifications.clicking_the_button": "notifications.clicking_the_button",
     "pagination.previous": "pagination.previous",

resources/lang/fr.json

@@ -1,7 +1,12 @@
 {
+    "This user did not verify his\/her email so you cannot contact him\/her": "Cet utilisateur-trice doit vérifier son adresse email pour être contacté(e)",
+    "Please type a message": "Veuillez taper votre message",
+    "The user you are trying to contact did not verify his\/her email": "Cet utilisateur-trice doit vérifier son adresse email pour être contacté(e)",
+    "Filter": "Filtrer",
     "Homepage": "Accueil",
     "Latest discussions": "Dernières discussions",
     "Calendar": "Agenda",
+    "Rename": "Renomer",
     "This admin setting page is a work in progress. Some settings are not used yet (but all are saved for future use)": "This admin setting page is a work in progress. Some settings are not used yet (but all are saved for future use)",
     "Application name": "Application name",
     "The name of your application. Used everywhere, in titles, in emails, etc... Choose a short and catchy name": "The name of your application. Used everywhere, in titles, in emails, etc... Choose a short and catchy name",
@@ -19,13 +24,21 @@
     "Notify administrators when a new group is created": "Notify administrators when a new group is created",
     "Post by email": "Post by email",
     "Allow users to post by email": "Allow users to post by email",
-    "Administer group": "Administer group",
-    "Delete group": "Delete group",
+    "Show my groups": "Afficher mes groupes",
+    "Show all groups": "Afficher tous les groupes",
+    "New": "New",
+    "Edit tags": "Modifier les tags",
+    "Administer group": "Administrer le groupe",
+    "Delete group": "Effacer le groupe",
     "Are you really sure you want to delete this groups and all it\\'s content?": "Are you really sure you want to delete this groups and all it\\'s content?",
     "You are going to delete this group : ": "You are going to delete this group : ",
     "Altough this can be undone by an admin please make sure you want this groups to be deleted before clicking": "Altough this can be undone by an admin please make sure you want this groups to be deleted before clicking",
+    "Contact": "Contact",
+    "Use the form below to send an email directly to this user.": "Utilisez le formulaire ci-dessous pour contacter directement un utilisateur par mail.",
+    "Your message :": "Votre message :",
+    "Reveal my email to this user so we can communicate by email": "Révéler mon adresse email pour que nous puissions communiquer directement par mail",
     "notifications.if_you_have_trouble": "notifications.if_you_have_trouble",
     "notifications.clicking_the_button": "notifications.clicking_the_button",
     "pagination.previous": "pagination.previous",
     "pagination.next": "pagination.next"
-}
+}

resources/lang/nl.json

@@ -1,7 +1,12 @@
 {
+    "This user did not verify his\/her email so you cannot contact him\/her": "This user did not verify his\/her email so you cannot contact him\/her",
+    "Please type a message": "Please type a message",
+    "The user you are trying to contact did not verify his\/her email": "The user you are trying to contact did not verify his\/her email",
+    "Filter": "Filter",
     "Homepage": "Homepage",
     "Latest discussions": "Latest discussions",
     "Calendar": "Calendar",
+    "Rename": "Rename",
     "This admin setting page is a work in progress. Some settings are not used yet (but all are saved for future use)": "This admin setting page is a work in progress. Some settings are not used yet (but all are saved for future use)",
     "Application name": "Application name",
     "The name of your application. Used everywhere, in titles, in emails, etc... Choose a short and catchy name": "The name of your application. Used everywhere, in titles, in emails, etc... Choose a short and catchy name",
@@ -19,11 +24,19 @@
     "Notify administrators when a new group is created": "Notify administrators when a new group is created",
     "Post by email": "Post by email",
     "Allow users to post by email": "Allow users to post by email",
+    "Show my groups": "Show my groups",
+    "Show all groups": "Show all groups",
+    "New": "New",
+    "Edit tags": "Edit tags",
     "Administer group": "Administer group",
     "Delete group": "Delete group",
     "Are you really sure you want to delete this groups and all it\\'s content?": "Are you really sure you want to delete this groups and all it\\'s content?",
     "You are going to delete this group : ": "You are going to delete this group : ",
     "Altough this can be undone by an admin please make sure you want this groups to be deleted before clicking": "Altough this can be undone by an admin please make sure you want this groups to be deleted before clicking",
+    "Contact": "Contact",
+    "Use the form below to send an email directly to this user.": "Use the form below to send an email directly to this user.",
+    "Your message :": "Your message :",
+    "Reveal my email to this user so we can communicate by email": "Reveal my email to this user so we can communicate by email",
     "notifications.if_you_have_trouble": "notifications.if_you_have_trouble",
     "notifications.clicking_the_button": "notifications.clicking_the_button",
     "pagination.previous": "pagination.previous",

resources/views/dashboard/groups.blade.php

@@ -9,7 +9,7 @@
 
         <form class="form-inline" role="search" method="GET" action="{{route('groups.index')}}" up-autosubmit up-delay="100" up-target=".groups" up-reveal='false'>
             <div class="input-group">
-                <input value="{{Request::get('search')}}" class="form-control" type="text" name="search"  placeholder="{{_('Filter')}}..." aria-label="Search">
+                <input value="{{Request::get('search')}}" class="form-control" type="text" name="search"  placeholder="{{__('Filter')}}..." aria-label="Search">
 
                 <div class="input-group-append">
                     <button class="btn btn-secondary" type="submit"><span class="fa fa-search"></span></button>

resources/views/discussions/discussion.blade.php

@@ -42,7 +42,7 @@
   <div class="comment-count d-flex justify-content-end">
     @if ($discussion->unReadCount() > 0)
       <div class="d-flex align-items-start">
-        <div class="badge badge-danger mr-1">{{_('New')}}</div>
+        <div class="badge badge-danger mr-1">{{__('New')}}</div>
         <div class="badge badge-primary" style="min-width: 2em">{{ $discussion->unReadCount() }}</div>
       </div>
     @else
@@ -71,7 +71,7 @@
         @endcan
 
         <a class="dropdown-item" up-modal=".dialog" href="{{ route('groups.tags.edit', [$discussion->group, 'discussions', $discussion]) }}">
-          <i class="fa fa-tags"></i> {{_('Edit tags')}}
+          <i class="fa fa-tags"></i> {{__('Edit tags')}}
         </a>
 
         @can('delete', $discussion)

resources/views/partials/preferences-show.blade.php

@@ -3,7 +3,7 @@
 
     <div class="dropdown">
       <button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        {{_('Show my groups')}}
+        {{__('Show my groups')}}
       </button>
       <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
         <a href="?set_preference=show&value=my" class="dropdown-item">{{trans('messages.my_groups')}}</a>
@@ -14,7 +14,7 @@
   @else
     <div class="dropdown">
       <button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        {{_('Show all groups')}}
+        {{__('Show all groups')}}
       </button>
       <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
         <a href="?set_preference=show&value=my" class="dropdown-item">{{trans('messages.my_groups')}}</a>

resources/views/users/contact.blade.php

@@ -6,24 +6,24 @@
 
 <div class="tab_content">
 
-  <h1>{{_('Contact')}} {{ $user->name }}</h1>
+  <h1>{{__('Contact')}} {{ $user->name }}</h1>
 
   <div class="help">
-    {{_('Use the form below to send an email directly to this user.')}}
+    {{__('Use the form below to send an email directly to this user.')}}
   </div>
 
   {!! Form::open(['action' => ['UserController@contact', $user]]) !!}
 
 
 
   <div class="form-group">
-    {!! Form::label('body', _('Your message :')) !!}
+    {!! Form::label('body', __('Your message :')) !!}
     {!! Form::textarea('body', null, ['class' => 'form-control', 'required']) !!}
   </div>
 
   <div class="form-check">
    <input type="checkbox" class="form-check-input" name="reveal_email" id="reveal_email" checked="checked">
-   <label class="form-check-label" for="reveal_email">{{_('Reveal my email to this user so we can communicate by email')}}</label>
+   <label class="form-check-label" for="reveal_email">{{__('Reveal my email to this user so we can communicate by email')}}</label>
  </div>