Merge pull request #467 from budda85/master

Load font locally without Google
OpenOlitor · Aug 18, 2020 · 01c2e15 · 01c2e15
2 parents c113cb9 + d7cd3dd
commit 01c2e15
Show file tree

Hide file tree

Showing 10 changed files with 3,748 additions and 89 deletions.
diff --git a/app/fonts/droid-sans.css b/app/fonts/droid-sans.css
@@ -0,0 +1,21 @@
+/* latin */
+@font-face {
+  font-family: 'Droid Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Droid Sans Regular'),
+	   local('DroidSans-Regular'),
+	   url('./droid-sans/droidsans-latin-400.woff2') format('woff2');
+	   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* latin */
+@font-face {
+  font-family: 'Droid Sans';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Droid Sans Bold'), 
+	   local('DroidSans-Bold'), 
+	   url('./droid-sans/droidsans-latin-700.woff2') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/app/fonts/droid-sans/droidsans-latin-400.woff2 b/app/fonts/droid-sans/droidsans-latin-400.woff2
diff --git a/app/fonts/droid-sans/droidsans-latin-700.woff2 b/app/fonts/droid-sans/droidsans-latin-700.woff2
diff --git a/app/index.html b/app/index.html
@@ -30,7 +30,7 @@
   <link rel="stylesheet" href="bower_components/jasny-bootstrap/dist/css/jasny-bootstrap.css" />
   <!-- endbuild -->
 
-  <link href='https://fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'>
+  <link href='fonts/droid-sans.css' rel='stylesheet' type='text/css'>
   <link rel="stylesheet" href="third_party/quill/quill.snow.css">
 
   <!-- build:css(.tmp) styles/main.css -->

diff --git a/app/scripts/abotypen/detail/abotypendetail.html b/app/scripts/abotypen/detail/abotypendetail.html
@@ -7,8 +7,8 @@
       <div class="panel panel-default">
         <div class="panel-heading clearfix abotypHeader" ng-style="abotypStyle" >
           <h3 class="panel-title">
-              <span class=" navbar-brand" ng-if="getModel() === 'abotypen'">{{'Abotyp ' + abotyp.name || 'Abotyp'|translate}}</span>
-              <span class=" navbar-brand" ng-if="getModel() === 'zusatzAbotypen'">{{'Zusatzabotyp ' + zusatzAbotyp.name || 'Zusatzabotyp'|translate}}</span>
+              <span class=" navbar-brand" ng-if="getModel() === 'abotypen'">{{'Abotyp'|translate}} {{' ' + abotyp.name}}</span>
+              <span class=" navbar-brand" ng-if="getModel() === 'zusatzAbotypen'">{{'Zusatzabotyp'|translate}} {{' ' + zusatzAbotyp.name}}</span>
             <div class="btn-group pull-right" ng-if="getModel() === 'abotypen'" role="group">
               <oo-save-button model="abotyp" form="abotypForm" entity="Abotyp" on-save="save" on-cancel="backToList" on-created="created">{{fullName() || 'Abotyp'|translate}}</oo-save-button>
               <oo-delete-button ng-if="abotyp.anzahlAbonnenten === 0" model="abotyp" form="abotypForm" entity="Abotyp" on-delete="delete" on-deleted="backToList" confirm="true"></oo-delete-button>

diff --git a/app/scripts/i18n/translations.js b/app/scripts/i18n/translations.js
diff --git a/app/scripts/kunden/detail/kundendetail.controller.js b/app/scripts/kunden/detail/kundendetail.controller.js
@@ -68,7 +68,7 @@ angular.module('openolitor-admin')
         noEntityText: true,
         labelFunction: function() {
           if ($scope.isExisting()) {
-            return $scope.kundeBezeichnung() + ' ' + gettext('speichern');
+            return $scope.kundeBezeichnung() + ' ' + gettextCatalog.getString('speichern');
           } else {
             return ($scope.kundeBezeichnung() || gettext('Kunde')) + ' ' + gettext('erstellen');
           }

diff --git a/i18n/en/en.po b/i18n/en/en.po
@@ -5,11 +5,13 @@ msgstr ""
 "Project-Id-Version: openolitor-client-admin\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: openolitor-client-admin\n"
+"X-Crowdin-Project-ID: 393649\n"
 "X-Crowdin-Language: en\n"
 "X-Crowdin-File: /prod/template.pot\n"
+"X-Crowdin-File-ID: 4\n"
 "Language-Team: English\n"
 "Language: en_US\n"
-"PO-Revision-Date: 2020-04-16 08:42\n"
+"PO-Revision-Date: 2020-08-03 15:51\n"
 
 #: app/scripts/dashboard/dashboard.html:54
 #: app/scripts/lieferplanungen/detail/lieferanten.html:40
@@ -1108,7 +1110,7 @@ msgstr "This product is already in the basket. Do you want to add it again?"
 #: app/scripts/rechnungen/detail/rechnungendetail.html:181
 #: app/scripts/rechnungen/overview/rechnungenoverview.html:54
 msgid "Einbezahlter Betrag"
-msgstr "amount paid"
+msgstr "Amount paid"
 
 #: app/scripts/depots/detail/depotsdetail.html:27
 msgid "Eindeutige Bezeichnung"
@@ -1950,7 +1952,7 @@ msgstr "Create invoice manually"
 #: app/scripts/abos/overview/abosoverviewcreaterechnungspositionen.html:21
 #: app/scripts/abos/overview/abosoverviewcreaterechnungspositionen.html:53
 msgid "Manueller Betrag"
-msgstr "Manuel sum"
+msgstr "Manual sum"
 
 #: app/scripts/app.js:276
 msgid "Mar"
@@ -2828,7 +2830,7 @@ msgstr "Start of the accounting year"
 #: app/scripts/zahlungsimports/import/zahlungsimports.html:127
 #: app/scripts/zahlungsimports/import/zahlungsimports.html:77
 msgid "Status"
-msgstr "State"
+msgstr "Status"
 
 #: app/scripts/app.js:163
 #: app/scripts/app.js:169