traductions douteuses

app/javascript/flavours/glitch/features/getting_started/index.js

@@ -31,7 +31,7 @@ const messages = defineMessages({
   direct: { id: 'navigation_bar.direct', defaultMessage: 'Direct messages' },
   bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
-  settings: { id: 'navigation_bar.app_settings', defaultMessage: 'App settings' },
+  settings: { id: 'navigation_bar.app_settings', defaultMessage: 'Config visuelle' },
   follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
   lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
   keyboard_shortcuts: { id: 'navigation_bar.keyboard_shortcuts', defaultMessage: 'Keyboard shortcuts' },

app/javascript/flavours/glitch/features/ui/components/link_footer.js

@@ -57,6 +57,16 @@ class LinkFooter extends React.PureComponent {
         <p>
           <strong>{domain}</strong>:
           {' '}
+          <a href='https://www.cipherbliss.com'>
+            <i className='fa fa-world' />Cipherbliss.com</a >
+          <a href='https://mastodon.cipherbliss.com/@tykayn'>
+            <i className='fa fa-paper-plane' />
+            contactez l'admin
+          </a >
+          <a href='https://liberapay.com/cipherbliss'>
+            <i className='fa fa-coffee' /> Supportez
+            Cipherbliss</a >
+
           <Link key='about' to='/about'><FormattedMessage id='footer.about' defaultMessage='About' /></Link>
           {canInvite && (
             <>

app/javascript/flavours/glitch/features/ui/components/navigation_panel.js

@@ -18,7 +18,7 @@ const messages = defineMessages({
   explore: { id: 'explore.title', defaultMessage: 'Explore' },
   local: { id: 'tabs_bar.local_timeline', defaultMessage: 'Local' },
   federated: { id: 'tabs_bar.federated_timeline', defaultMessage: 'Federated' },
-  direct: { id: 'navigation_bar.direct', defaultMessage: 'Direct messages' },
+  direct: { id: 'navigation_bar.direct', defaultMessage: 'Lettres d\'amour' },
   favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
   bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
   lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
@@ -26,7 +26,7 @@ const messages = defineMessages({
   followsAndFollowers: { id: 'navigation_bar.follows_and_followers', defaultMessage: 'Follows and followers' },
   about: { id: 'navigation_bar.about', defaultMessage: 'About' },
   search: { id: 'navigation_bar.search', defaultMessage: 'Search' },
-  app_settings: { id: 'navigation_bar.app_settings', defaultMessage: 'App settings' },
+  app_settings: { id: 'navigation_bar.app_settings', defaultMessage: 'Config visuelle' },
 });
 
 export default @injectIntl

app/javascript/flavours/glitch/locales/fr.js

@@ -1,7 +1,9 @@
 import inherited from 'mastodon/locales/fr.json';
 
 const messages = {
-  //  No translations available.
+  'navigation_bar.app_settings': 'Config de ouf',
+  'tabs_bar.local_timeline': 'Bilveusées locales',
+  'tabs_bar.federated_timeline': 'La mine de sel',
 };
 
 export default Object.assign({}, inherited, messages);

app/javascript/flavours/glitch/styles/_custom_tk.scss

@@ -1,19 +1,81 @@
+.auth-land {
 
-.auth-container-bg-img{
+  .login-instance-name {
+    font-size: 3rem;
+    text-align: center;
+    margin-top: 1.5rem;
+    background: url('~flavours/glitch/images/bliss/home.jpg');
+    background-repeat: no-repeat;
+    background-position: center bottom;
+    background-repeat: no-repeat;
+    height: 5rem;
+    background-size: 3.5rem;
+  }
 
-  width: 100%;
-  height: 100vh;
-  opacity: 0.15;
-  filter: alpha(opacity=15);
-  background: url('~flavours/glitch/images/bliss/home2.jpg');
-  background-position: center;
+  .auth-container-bg-img {
+    width: 100%;
+    height: 100vh;
+    opacity: 0.15;
+    filter: alpha(opacity=15);
+    background: url('~flavours/glitch/images/bliss/home2.jpg');
+    background-position: right;
+    background-repeat: no-repeat;
+    left: 0;
+    top: 0;
+    margin: 0 auto;
+    overflow: hidden;
+    position: fixed;
+    z-index: -1;
+  }
+
+  .container-alt {
+    z-index: 10;
+    margin: auto;
+    float:left;
+  }
+
+  .dismissable-banner {
+    background: $base-overlay-background;
+  }
+
+  .mention.status-link {
+    background: $base-overlay-background;
+    border-radius: 100%;
+  }
+}
+.admin{
+  .sidebar-wrapper{
+    background-image: url('~flavours/glitch/images/bliss/home2.jpg');
+    background-position: left;
+    background-repeat: no-repeat;
+  }
+
+  .accounts-table__email{
+    width: 200px;
+  }
+}
+
+#mastodon{
+  background-image: linear-gradient(transparent, #15141A 90%), url('~flavours/glitch/images/bliss/a_travers_pic_mastodon_grey.jpg');
+  background-position: top left;
+  background-attachment: fixed;
   background-repeat: no-repeat;
-  left: 0;
-  top: 0;
-  margin: 0 auto;
-  overflow: hidden;
-  position: fixed;
+  background-size: cover;
+  .compose-panel{
+    //background-image: linear-gradient(transparent, #15141A 90%);
+  }
+  .navigation-bar__profile .permalink.acct{
+    font-size: 1.25rem;
+  }
 }
-.dismissable-banner{
-  background: $base-overlay-background;
+
+// add logo in links on webapp
+.link-footer{
+  background-image: url('~flavours/glitch/images/bliss/home.jpg');
+  background-position: left;
+  background-repeat: no-repeat;
+
+  a{
+    margin-right: 2ch;
+  }
 }

app/javascript/mastodon/features/ui/components/link_footer.js

@@ -57,6 +57,15 @@ class LinkFooter extends React.PureComponent {
         <p>
           <strong>{domain}</strong>:
           {' '}
+          <a href='https://www.cipherbliss.com'>
+            <i className='fa fa-world' />Cipherbliss.com</a >
+          <a href='https://mastodon.cipherbliss.com/@tykayn'>
+            <i className='fa fa-paper-plane' />
+            contactez l'admin
+          </a >
+          <a href='https://liberapay.com/cipherbliss'>
+            <i className='fa fa-coffee' /> Supportez
+            Cipherbliss</a >
           <Link key='about' to='/about'><FormattedMessage id='footer.about' defaultMessage='About' /></Link>
           {canInvite && (
             <>

app/javascript/mastodon/locales/fr.json

@@ -100,8 +100,8 @@
   "column.about": "À propos",
   "column.blocks": "Utilisateurs bloqués",
   "column.bookmarks": "Signets",
-  "column.community": "Fil public local",
-  "column.direct": "Messages directs",
+  "column.community": "Bilveusées locales",
+  "column.direct": "Lettres d'amour",
   "column.directory": "Parcourir les profils",
   "column.domain_blocks": "Domaines bloqués",
   "column.favourites": "Favoris",
@@ -367,24 +367,24 @@
   "navigation_bar.about": "À propos",
   "navigation_bar.blocks": "Comptes bloqués",
   "navigation_bar.bookmarks": "Marque-pages",
-  "navigation_bar.community_timeline": "Fil public local",
+  "navigation_bar.community_timeline": "Bilveusées locales",
   "navigation_bar.compose": "Rédiger un nouveau message",
-  "navigation_bar.direct": "Messages directs",
+  "navigation_bar.direct": "Lettres d'amour",
   "navigation_bar.discover": "Découvrir",
   "navigation_bar.domain_blocks": "Domaines bloqués",
   "navigation_bar.edit_profile": "Modifier le profil",
   "navigation_bar.explore": "Explorer",
-  "navigation_bar.favourites": "Favoris",
+  "navigation_bar.favourites": "Appréciés",
   "navigation_bar.filters": "Mots masqués",
-  "navigation_bar.follow_requests": "Demandes d’abonnement",
-  "navigation_bar.follows_and_followers": "Abonnements et abonnés",
+  "navigation_bar.follow_requests": "Demandes de stalkers",
+  "navigation_bar.follows_and_followers": "Abonnements et adeptes",
   "navigation_bar.lists": "Listes",
   "navigation_bar.logout": "Déconnexion",
   "navigation_bar.mutes": "Comptes masqués",
   "navigation_bar.personal": "Personnel",
   "navigation_bar.pins": "Messages épinglés",
   "navigation_bar.preferences": "Préférences",
-  "navigation_bar.public_timeline": "Fil public global",
+  "navigation_bar.public_timeline": "Galaxies voisines",
   "navigation_bar.search": "Rechercher",
   "navigation_bar.security": "Sécurité",
   "not_signed_in_indicator.not_signed_in": "Vous devez vous connecter pour accéder à cette ressource.",

app/views/layouts/auth.html.haml

@@ -1,14 +1,18 @@
 - content_for :content do
-  .auth-container-bg-img
-  .container-alt
-    .logo-container
-      %h1
-        = link_to root_path do
-          = logo_as_symbol(:wordmark)
+  .auth-land
+    .container-alt
+      .logo-container
+        %h1
+          = link_to root_path do
+            = logo_as_symbol(:wordmark)
+        .login-instance-name
+          CipherBliss
 
-    .form-container
-      = render 'flashes'
+      .form-container
+        = render 'flashes'
+
+        = yield
+    .auth-container-bg-img
 
-      = yield
 
 = render template: 'layouts/application'