minor typo fixes

spotbot2k · Sep 6, 2018 · 2264432 · 2264432
1 parent 0186184
commit 2264432
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,4 +26,8 @@
 #### 0.7.0
 
 - FIX: minor typo fixes
-- ADD: Overwrite font on import to avoid duplicates
+- ADD: Overwrite font on import to avoid duplicates
+
+#### 0.7.1
+
+- FIX: minor typo and code quality fixes
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ Please use only free or properly licensed fonts.
 - Generate and load font CSS
 - Manage font styles (bold, italic etc.)
 - Assign fonts to CSS selectors automaticly
-- Tested on Contao 4.3.11, 4.4.20, 4.5.10
+- Tested on Contao 4.3.11, 4.4.20 - 4.4.24, 4.5.10, 4.6.3
 
 #### TODO
 

diff --git a/src/Resources/contao/dca/tl_fonts.php b/src/Resources/contao/dca/tl_fonts.php
@@ -290,7 +290,7 @@ public function renderStyleLabel($row, $label = false)
 
         if ($format) {
             $format = implode(', ', $format);
-            $label = sprintf('<span style="color:#b3b3b3;padding-left:3px">[%s]</span>%s %s', $format, $this->getFontFaceName($row['pid']), $label);
+            $label = sprintf('<span style="color:#b3b3b3;padding-left:3px">[%s]</span>%s%s', $format, $this->getFontFaceName($row['pid']), $label);
         }
 
         if ($row['style'] !== 'normal') {
@@ -336,7 +336,7 @@ public function checkPermission()
      */
     private function getFontFaceName($fontId)
     {
-        $fontFace = $this->Database->prepare('SELECT name FROM tl_fonts_faces WHERE id = ? LIMIT 1')->execute($fontId);
+        $fontFace = $this->Database->prepare('SELECT `name` FROM `tl_fonts_faces` WHERE `id` = ? LIMIT 1')->execute($fontId);
         if ($fontFace->name) {
             return ' '.$fontFace->name;
         }

diff --git a/src/Resources/contao/dca/tl_user_group.php b/src/Resources/contao/dca/tl_user_group.php
@@ -1,13 +1,12 @@
 <?php
 
 $GLOBALS['TL_DCA']['tl_user_group']['palettes']['default'] .= ';{webfont_legend},webfont_generator';
-
 $GLOBALS['TL_DCA']['tl_user_group']['fields']['webfont_generator'] = array(
     'label'                   => &$GLOBALS['TL_LANG']['tl_user_group']['webfont_generator'],
     'exclude'                 => true,
     'inputType'               => 'checkbox',
     'options'                 => array('create', 'delete'),
     'reference'               => &$GLOBALS['TL_LANG']['MSC'],
-    'eval'                    => array('multiple'=>true),
+    'eval'                    => array('multiple' => true),
     'sql'                     => "blob NULL"
 );
diff --git a/src/Resources/contao/languages/de/tl_fonts_faces.xlf b/src/Resources/contao/languages/de/tl_fonts_faces.xlf
@@ -83,19 +83,19 @@
                 </trans-unit>
                 <trans-unit id="tl_fonts_faces.import.0">
                     <source>CSS import</source>
-                    <target>CSS importieren</target>
+                    <target>CSS-Import</target>
                 </trans-unit>
                 <trans-unit id="tl_fonts_faces.import.1">
                     <source>Import existing CSS files</source>
                     <target>Schriften aus einer CSS-Datei einlesen</target>
                 </trans-unit>
                 <trans-unit id="tl_fonts_faces.source.0">
                     <source>Source files</source>
-                    <target>CSS-Dateien</target>
+                    <target>Quelldateien</target>
                 </trans-unit>
                 <trans-unit id="tl_fonts_faces.source.1">
                     <source>Here you can upload one or more .css files to be imported.</source>
-                    <target>Hier können Sie eines oder mehrere CSS-Dateien hochladen.</target>
+                    <target>Hier können Sie eine oder mehrere .css-Dateien für den Import hochladen.</target>
                 </trans-unit>
                 <trans-unit id="tl_fonts_faces.overwrite.0">
                     <source>Overwrite font</source>