v0.5.0 (see release notes)

wottpal · May 8, 2018 · af946d1 · af946d1
1 parent da0318f
commit af946d1
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 30 deletions.
diff --git a/broken-links-widget.php b/broken-links-widget.php
@@ -5,7 +5,7 @@
 *
 * @package   Kirby CMS
 * @author    Dennis Kerzig <hi@wottpal.com>
-* @version   0.4.0
+* @version   0.5.0
 *
 */
 
@@ -20,7 +20,6 @@
  */
 function loadBlinksTranslation()
 {
-
     if (defined('KIRBY')) {
         $site = kirby()->site();
         $code = $site->multilang() ? $site->language()->code() : $site->user()->language();

diff --git a/broken-links/broken-links.php b/broken-links/broken-links.php
@@ -63,8 +63,7 @@
     // Populate the Widget-Template
     return tpl::load(__DIR__ . DS . 'template.php', [
       'broken_links' => $broken_links,
-      'has_broken_links' => !empty(array_filter($broken_links)),
-      'brokenLinksOk' => l::get('broken-links.ok')
+      'has_broken_links' => !empty(array_filter($broken_links))
     ]);
   }
 

diff --git a/broken-links/template.php b/broken-links/template.php
@@ -1,5 +1,6 @@
 <?php include_once __DIR__ . DS . '..' . DS . 'helpers.php'; ?>
 
+<?php loadBlinksTranslation(); ?>
 
 <style>
 .broken-link-list {
@@ -16,7 +17,7 @@
 
 <?php if(!$has_broken_links): ?>
   <div class="dashboard-box" style="margin-top: 1rem;">
-    <div class="text"><?= $brokenLinksOk ?></div>
+    <div class="text"><?= l::get('broken-links.ok') ?></div>
   </div>
 
 <?php else: ?>
@@ -28,8 +29,9 @@
       <li>
       <a href="<?= $page->url('edit') ?>">
         <?= $page->icon() ?>
+        <?php $links_string = count($links) == 1 ? l::get('broken-links.link') : l::get('broken-links.links'); ?>
         <span><?= $page->title() ?></span>
-        <small class="marginalia shiv shiv-left shiv-white" style="color: red; font-weight:bold;"><?= count($links) ?> <?= link_string(count($links)) ?></small>
+        <small class="marginalia shiv shiv-left shiv-white" style="color: red; font-weight:bold;"><?= count($links) ?> <?= $links_string ?></small>
       </a>
 
       <ul class="broken-link-list">

diff --git a/helpers.php b/helpers.php
@@ -1,15 +1,6 @@
 <?php
 
 
-/**
- * Returns either singular or plural "Links" string.
- * TODO Has to be localized.
- */
-function link_string($count) {
-  return $count == 1 ? "Link" : "Links";
-}
-
-
 /**
  * Returns the HTTP-Response-Code of a given Domain.
  */

diff --git a/languages/de.php b/languages/de.php
@@ -1,7 +1,9 @@
 <?php
 
 l::set([
-    'broken-links.brokenLinks' => 'Tote Links',
-    'broken-links.ok' => 'Alle internen Links scheinen zu funktionieren.',
-    'broken-links.check' => 'Jetzt überprüfen'
+  'broken-links.link' => 'Link',
+  'broken-links.links' => 'Links',
+  'broken-links.brokenLinks' => 'Tote Links',
+  'broken-links.ok' => 'Alle internen Links scheinen zu funktionieren.',
+  'broken-links.check' => 'Jetzt überprüfen'
 ]);
diff --git a/languages/en.php b/languages/en.php
@@ -1,7 +1,9 @@
 <?php
 
 l::set([
-    'broken-links.brokenLinks' => 'Broken links',
-    'broken-links.ok' => 'All internal links seem to be okay.',
-    'broken-links.check' => 'Check now'
-]);
+  'broken-links.link' => 'Link',
+  'broken-links.links' => 'Links',  
+  'broken-links.brokenLinks' => 'Broken links',
+  'broken-links.ok' => 'All internal links seem to be okay.',
+  'broken-links.check' => 'Check now'
+]);
diff --git a/languages/fr.php b/languages/fr.php
@@ -1,7 +1,9 @@
 
 <?php
 l::set([
-    'broken-links.brokenLinks' => 'Liens cassés',
-    'broken-links.ok' => 'Tous les liens internes semblent fonctionner.',
-    'broken-links.check' => 'Vérifier maintenant'
+  'broken-links.link' => 'Lien',
+  'broken-links.links' => 'Liens',
+  'broken-links.brokenLinks' => 'Liens cassés',
+  'broken-links.ok' => 'Tous les liens internes semblent fonctionner.',
+  'broken-links.check' => 'Vérifier maintenant'
 ]);
diff --git a/languages/pl.php b/languages/pl.php
@@ -1,7 +1,9 @@
 <?php
 
 l::set([
-    'broken-links.brokenLinks' => 'Niedziałające linki',
-    'broken-links.ok' => 'Wszystkie linki na stronie są poprawne i działają.',
-    'broken-links.check' => 'Sprawdź'
-]);
+  'broken-links.link' => 'Link',
+  'broken-links.links' => 'Links',
+  'broken-links.brokenLinks' => 'Niedziałające linki',
+  'broken-links.ok' => 'Wszystkie linki na stronie są poprawne i działają.',
+  'broken-links.check' => 'Sprawdź'
+]);
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "broken-links-widget",
   "description": "A Kirby panel-widget which shows broken links within the pages.",
   "author": "Dennis Kerzig <hi@wottpal.com> (https://wottpal.com)",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "type": "kirby-plugin",
   "license": "MIT"
 }