From: Chocobozzz <me@florianbigard.com>
Date: Wed, 5 Sep 2018 13:59:43 +0000 (+0200)
Subject: Fix occitan label
X-Git-Tag: v1.0.0-beta.12~18
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=db6d617dd2e578894661e57dafe02194e2b28f16;p=github%2FChocobozzz%2FPeerTube.git

Fix occitan label
---

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index b96cf07c0..bf4cccaaf 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -27,7 +27,7 @@ body {
   --mainBackgroundColor: #{$bg-color};
   --mainForegroundColor: #{$fg-color};
   --submenuColor: #{$sub-menu-color};
-  --inputColor: #{$input-color};
+  --inputColor: #{$input-background-color};
   --inputPlaceholderColor: #{$input-placeholder-color};
 
   font-family: $main-fonts;
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss
index 0735a00a0..6ea48f800 100644
--- a/client/src/sass/include/_variables.scss
+++ b/client/src/sass/include/_variables.scss
@@ -46,7 +46,7 @@ $video-thumbnail-width: 200px;
 
 $theater-bottom-space: 85px;
 
-$input-color: inherit;
+$input-background-color: $bg-color;
 $input-placeholder-color: #898989;
 
 /*** map theme ***/
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index efe27a241..ba8b9b6ed 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -755,6 +755,9 @@ function buildLanguages () {
     })
     .forEach(l => languages[l.iso6391 || l.iso6393] = l.name)
 
+  // Override Occitan label
+  languages['oc'] = 'Occitan'
+
   return languages
 }