From 1fc62ae3e5e3a99993576e915c0e130aa0349810 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 12 Aug 2019 14:22:00 +0000 Subject: [PATCH] [FIX] web: remove white spaces in ttf file names Since ed18095127, some google fonts are included. The "Open Sans" fonts prevents RPM packaging to work because of white spaces in file names. This is a Python setuptools bug (https://bugs.python.org/issue809163) which is not yet fixed. With this commit, the "Open Sans" directory and ttf files are renamed into "Open_Sans", solving the packaging problem. closes odoo/odoo#35661 Signed-off-by: Aaron Bohy (aab) --- .../google/{Open Sans => Open_Sans}/LICENSE.txt | 0 .../Open_Sans-Bold.ttf} | Bin .../Open_Sans-BoldItalic.ttf} | Bin .../Open_Sans-ExtraBold.ttf} | Bin .../Open_Sans-ExtraBoldItalic.ttf} | Bin .../Open_Sans-Italic.ttf} | Bin .../Open_Sans-Light.ttf} | Bin .../Open_Sans-LightItalic.ttf} | Bin .../Open_Sans-Regular.ttf} | Bin .../Open_Sans-SemiBold.ttf} | Bin .../Open_Sans-SemiBoldItalic.ttf} | Bin addons/web/static/src/scss/fonts.scss | 2 +- odoo/addons/base/models/res_company.py | 2 +- 13 files changed, 2 insertions(+), 2 deletions(-) rename addons/web/static/src/fonts/google/{Open Sans => Open_Sans}/LICENSE.txt (100%) rename addons/web/static/src/fonts/google/{Open Sans/Open Sans-Bold.ttf => Open_Sans/Open_Sans-Bold.ttf} (100%) rename addons/web/static/src/fonts/google/{Open Sans/Open Sans-BoldItalic.ttf => Open_Sans/Open_Sans-BoldItalic.ttf} (100%) rename addons/web/static/src/fonts/google/{Open Sans/Open Sans-ExtraBold.ttf => Open_Sans/Open_Sans-ExtraBold.ttf} (100%) rename addons/web/static/src/fonts/google/{Open Sans/Open Sans-ExtraBoldItalic.ttf => Open_Sans/Open_Sans-ExtraBoldItalic.ttf} (100%) rename addons/web/static/src/fonts/google/{Open Sans/Open Sans-Italic.ttf => Open_Sans/Open_Sans-Italic.ttf} (100%) rename addons/web/static/src/fonts/google/{Open Sans/Open Sans-Light.ttf => Open_Sans/Open_Sans-Light.ttf} (100%) rename addons/web/static/src/fonts/google/{Open Sans/Open Sans-LightItalic.ttf => Open_Sans/Open_Sans-LightItalic.ttf} (100%) rename addons/web/static/src/fonts/google/{Open Sans/Open Sans-Regular.ttf => Open_Sans/Open_Sans-Regular.ttf} (100%) rename addons/web/static/src/fonts/google/{Open Sans/Open Sans-SemiBold.ttf => Open_Sans/Open_Sans-SemiBold.ttf} (100%) rename addons/web/static/src/fonts/google/{Open Sans/Open Sans-SemiBoldItalic.ttf => Open_Sans/Open_Sans-SemiBoldItalic.ttf} (100%) diff --git a/addons/web/static/src/fonts/google/Open Sans/LICENSE.txt b/addons/web/static/src/fonts/google/Open_Sans/LICENSE.txt similarity index 100% rename from addons/web/static/src/fonts/google/Open Sans/LICENSE.txt rename to addons/web/static/src/fonts/google/Open_Sans/LICENSE.txt diff --git a/addons/web/static/src/fonts/google/Open Sans/Open Sans-Bold.ttf b/addons/web/static/src/fonts/google/Open_Sans/Open_Sans-Bold.ttf similarity index 100% rename from addons/web/static/src/fonts/google/Open Sans/Open Sans-Bold.ttf rename to addons/web/static/src/fonts/google/Open_Sans/Open_Sans-Bold.ttf diff --git a/addons/web/static/src/fonts/google/Open Sans/Open Sans-BoldItalic.ttf b/addons/web/static/src/fonts/google/Open_Sans/Open_Sans-BoldItalic.ttf similarity index 100% rename from addons/web/static/src/fonts/google/Open Sans/Open Sans-BoldItalic.ttf rename to addons/web/static/src/fonts/google/Open_Sans/Open_Sans-BoldItalic.ttf diff --git a/addons/web/static/src/fonts/google/Open Sans/Open Sans-ExtraBold.ttf b/addons/web/static/src/fonts/google/Open_Sans/Open_Sans-ExtraBold.ttf similarity index 100% rename from addons/web/static/src/fonts/google/Open Sans/Open Sans-ExtraBold.ttf rename to addons/web/static/src/fonts/google/Open_Sans/Open_Sans-ExtraBold.ttf diff --git a/addons/web/static/src/fonts/google/Open Sans/Open Sans-ExtraBoldItalic.ttf b/addons/web/static/src/fonts/google/Open_Sans/Open_Sans-ExtraBoldItalic.ttf similarity index 100% rename from addons/web/static/src/fonts/google/Open Sans/Open Sans-ExtraBoldItalic.ttf rename to addons/web/static/src/fonts/google/Open_Sans/Open_Sans-ExtraBoldItalic.ttf diff --git a/addons/web/static/src/fonts/google/Open Sans/Open Sans-Italic.ttf b/addons/web/static/src/fonts/google/Open_Sans/Open_Sans-Italic.ttf similarity index 100% rename from addons/web/static/src/fonts/google/Open Sans/Open Sans-Italic.ttf rename to addons/web/static/src/fonts/google/Open_Sans/Open_Sans-Italic.ttf diff --git a/addons/web/static/src/fonts/google/Open Sans/Open Sans-Light.ttf b/addons/web/static/src/fonts/google/Open_Sans/Open_Sans-Light.ttf similarity index 100% rename from addons/web/static/src/fonts/google/Open Sans/Open Sans-Light.ttf rename to addons/web/static/src/fonts/google/Open_Sans/Open_Sans-Light.ttf diff --git a/addons/web/static/src/fonts/google/Open Sans/Open Sans-LightItalic.ttf b/addons/web/static/src/fonts/google/Open_Sans/Open_Sans-LightItalic.ttf similarity index 100% rename from addons/web/static/src/fonts/google/Open Sans/Open Sans-LightItalic.ttf rename to addons/web/static/src/fonts/google/Open_Sans/Open_Sans-LightItalic.ttf diff --git a/addons/web/static/src/fonts/google/Open Sans/Open Sans-Regular.ttf b/addons/web/static/src/fonts/google/Open_Sans/Open_Sans-Regular.ttf similarity index 100% rename from addons/web/static/src/fonts/google/Open Sans/Open Sans-Regular.ttf rename to addons/web/static/src/fonts/google/Open_Sans/Open_Sans-Regular.ttf diff --git a/addons/web/static/src/fonts/google/Open Sans/Open Sans-SemiBold.ttf b/addons/web/static/src/fonts/google/Open_Sans/Open_Sans-SemiBold.ttf similarity index 100% rename from addons/web/static/src/fonts/google/Open Sans/Open Sans-SemiBold.ttf rename to addons/web/static/src/fonts/google/Open_Sans/Open_Sans-SemiBold.ttf diff --git a/addons/web/static/src/fonts/google/Open Sans/Open Sans-SemiBoldItalic.ttf b/addons/web/static/src/fonts/google/Open_Sans/Open_Sans-SemiBoldItalic.ttf similarity index 100% rename from addons/web/static/src/fonts/google/Open Sans/Open Sans-SemiBoldItalic.ttf rename to addons/web/static/src/fonts/google/Open_Sans/Open_Sans-SemiBoldItalic.ttf diff --git a/addons/web/static/src/scss/fonts.scss b/addons/web/static/src/scss/fonts.scss index 2324883532b..d1387316e68 100644 --- a/addons/web/static/src/scss/fonts.scss +++ b/addons/web/static/src/scss/fonts.scss @@ -85,7 +85,7 @@ $google-font-path: '../fonts/google'; } @include google-font-pair('Montserrat'); -@include google-font-pair('Open Sans'); +@include google-font-pair('Open_Sans'); @include google-font-pair('Oswald'); @include google-font-pair('Raleway'); @include google-font-pair('Roboto'); diff --git a/odoo/addons/base/models/res_company.py b/odoo/addons/base/models/res_company.py index 17c4e95446f..b77f109f8cb 100644 --- a/odoo/addons/base/models/res_company.py +++ b/odoo/addons/base/models/res_company.py @@ -94,7 +94,7 @@ class Company(models.Model): base_onboarding_company_state = fields.Selection([ ('not_done', "Not done"), ('just_done', "Just done"), ('done', "Done")], string="State of the onboarding company step", default='not_done') favicon = fields.Binary(string="Company Favicon", help="This field holds the image used to display a favicon for a given company.", default=_get_default_favicon) - font = fields.Selection([("Lato", "Lato"), ("Roboto", "Roboto"), ("Open Sans", "Open Sans"), ("Montserrat", "Montserrat"), ("Oswald", "Oswald"), ("Raleway", "Raleway")], default="Lato") + font = fields.Selection([("Lato", "Lato"), ("Roboto", "Roboto"), ("Open_Sans", "Open Sans"), ("Montserrat", "Montserrat"), ("Oswald", "Oswald"), ("Raleway", "Raleway")], default="Lato") primary_color = fields.Char() secondary_color = fields.Char() _sql_constraints = [