Merge branch 'master' of github.com:noesya/osuny

app/controllers/admin/research/researchers_controller.rb

@@ -15,7 +15,7 @@ class Admin::Research::ResearchersController < Admin::Research::ApplicationContr
 
   def breadcrumb
     super
-    add_breadcrumb t('researcher.researchers', count: 2),
+    add_breadcrumb t('research.researchers', count: 2),
                    admin_research_researchers_path
     breadcrumb_for @researcher
   end

app/views/admin/users/show.html.erb

@@ -23,10 +23,10 @@
           <td><%= User.human_attribute_name('language') %></td>
           <td class="text-end"><%= t("languages.#{@user.language.iso_code.to_s}") %></td>
         </tr>
-        <% if @user.researcher %>
+        <% if @user.member %>
           <tr>
-            <td><%= User.human_attribute_name('researcher') %></td>
-            <td class="text-end"><%= link_to @user.researcher, [:admin, @user.researcher] %></td>
+            <td><%= User.human_attribute_name('member') %></td>
+            <td class="text-end"><%= link_to @user.member, [:admin, @user.member] %></td>
           </tr>
         <% end %>
       </table>

config/locales/en.yml

@@ -22,9 +22,9 @@ en:
         first_name: First name
         language: Favourite language
         last_name: Last name
+        member: Member
         mobile_phone: Mobile phone
         picture: Profile picture
-        researcher: Researcher profile
         role: Role
     models:
       language:

config/locales/fr.yml

@@ -22,9 +22,9 @@ fr:
         first_name: Prénom
         language: Langue préférée
         last_name: Nom
+        member: Personnel
         mobile_phone: Téléphone portable
         picture: Photo de profil
-        researcher: Profil de chercheur
         role: Rôle
     models:
       language: