Rename variables

app/frontend/src/javascript/components/socials/fab-socials.tsx

@@ -23,7 +23,7 @@ export const FabSocials: React.FC<FabSocialsProps> = ({ show = false }) => {
 
   const { handleSubmit, register, setValue } = useForm();
 
-  const settingsList = supportedNetworks.map(el => `socials_${el}` as SettingName);
+  const settingsList = supportedNetworks.map(el => el as SettingName);
 
   const [fabNetworks, setFabNetworks] = useState([]);
   const [selectedNetworks, setSelectedNetworks] = useState([]);
@@ -64,7 +64,7 @@ export const FabSocials: React.FC<FabSocialsProps> = ({ show = false }) => {
         {fabNetworks.map((network, index) =>
           selectedNetworks.includes(network) &&
           <a key={index} href={network.url} target='_blank' rel="noreferrer">
-            <img src={`${Icons}#${network.name.replace('socials_', '')}`}></img>
+            <img src={`${Icons}#${network.name}`}></img>
           </a>
         )}
       </div>
@@ -73,7 +73,7 @@ export const FabSocials: React.FC<FabSocialsProps> = ({ show = false }) => {
         <div className="social-icons">
           {fabNetworks.map((network, index) =>
             !selectedNetworks.includes(network) &&
-            <img key={index} src={`${Icons}#${network.name.replace('socials_', '')}`} onClick={() => selectNetwork(network)}></img>
+            <img key={index} src={`${Icons}#${network.name}`} onClick={() => selectNetwork(network)}></img>
           )}
         </div>
         {fabNetworks.map((network, index) =>
@@ -82,9 +82,9 @@ export const FabSocials: React.FC<FabSocialsProps> = ({ show = false }) => {
                     key={index}
                     register={register}
                     defaultValue={network.url}
-                    label={network.name.replace('socials_', '')}
+                    label={network.name}
                     placeholder={t('app.shared.text_editor.url_placeholder')}
-                    icon={<img src={`${Icons}#${network.name.replace('socials_', '')}`}></img>}
+                    icon={<img src={`${Icons}#${network.name}`}></img>}
                     addOn={<Trash size={16} />}
                     addOnAction={() => remove(network)} />
         )}

app/frontend/src/javascript/models/setting.ts

@@ -120,19 +120,19 @@ export enum SettingName {
   OverlappingCategories = 'overlapping_categories',
   ExtendedPricesInSameDay = 'extended_prices_in_same_day',
   PublicRegistrations = 'public_registrations',
-  SocialsFacebook = 'socials_facebook',
-  SocialsTwitter = 'socials_twitter',
-  SocialsViadeo = 'socials_viadeo',
-  SocialsLinkedin = 'socials_linkedin',
-  SocialsInstagram = 'socials_instagram',
-  SocialsYoutube = 'socials_youtube',
-  SocialsVimeo = 'socials_vimeo',
-  SocialsDailymotion = 'socials_dailymotion',
-  SocialsGithub = 'socials_github',
-  SocialsEchosciences = 'socials_echosciences',
-  SocialsPinterest = 'socials_pinterest',
-  SocialsLastfm = 'socials_lastfm',
-  SocialsFlickr = 'socials_flickr'
+  SocialsFacebook = 'facebook',
+  SocialsTwitter = 'twitter',
+  SocialsViadeo = 'viadeo',
+  SocialsLinkedin = 'linkedin',
+  SocialsInstagram = 'instagram',
+  SocialsYoutube = 'youtube',
+  SocialsVimeo = 'vimeo',
+  SocialsDailymotion = 'dailymotion',
+  SocialsGithub = 'github',
+  SocialsEchosciences = 'echosciences',
+  SocialsPinterest = 'pinterest',
+  SocialsLastfm = 'lastfm',
+  SocialsFlickr = 'flickr'
 }
 
 export type SettingValue = string|boolean|number;

app/models/setting.rb

@@ -131,19 +131,19 @@ class Setting < ApplicationRecord
                              public_registrations
                              accounting_Pack_code
                              accounting_Pack_label
-                             socials_facebook
-                             socials_twitter
-                             socials_viadeo
-                             socials_linkedin
-                             socials_instagram
-                             socials_youtube
-                             socials_vimeo
-                             socials_dailymotion
-                             socials_github
-                             socials_echosciences
-                             socials_pinterest
-                             socials_lastfm
-                             socials_flickr] }
+                             facebook
+                             twitter
+                             viadeo
+                             linkedin
+                             instagram
+                             youtube
+                             vimeo
+                             dailymotion
+                             github
+                             echosciences
+                             pinterest
+                             lastfm
+                             flickr] }
   # WARNING: when adding a new key, you may also want to add it in:
   # - config/locales/en.yml#settings
   # - app/frontend/src/javascript/models/setting.ts#SettingName

config/locales/en.yml

@@ -558,16 +558,16 @@ en:
     overlapping_categories: "Categories for overlapping booking prevention"
     extended_prices_in_same_day: "Extended prices in the same day"
     public_registrations: "Public registrations"
-    socials_facebook: "facebook"
-    socials_twitter: "twitter"
-    socials_viadeo: "viadeo"
-    socials_linkedin: "linkedin"
-    socials_instagram: "instagram"
-    socials_youtube: "youtube"
-    socials_vimeo: "vimeo"
-    socials_dailymotion: "dailymotion"
-    socials_github: "github"
-    socials_echosciences: "echosciences"
-    socials_pinterest: "pinterest"
-    socials_lastfm: "lastfm"
-    socials_flickr: "flickr"
+    facebook: "facebook"
+    twitter: "twitter"
+    viadeo: "viadeo"
+    linkedin: "linkedin"
+    instagram: "instagram"
+    youtube: "youtube"
+    vimeo: "vimeo"
+    dailymotion: "dailymotion"
+    github: "github"
+    echosciences: "echosciences"
+    pinterest: "pinterest"
+    lastfm: "lastfm"
+    flickr: "flickr"