Skip to content

Commit

Permalink
Merge pull request #225 from OSTraining/PR-222
Browse files Browse the repository at this point in the history
Fix: Constant instead of a static word
  • Loading branch information
billtomczak authored Aug 19, 2019
2 parents 5357971 + dc015ca commit fd3958c
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 37 deletions.
1 change: 1 addition & 0 deletions src/site/language/de-DE/de-DE.com_osdownloads.ini
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

COM_OSDOWNLOADS_BEFORE_DOWNLOAD = "Vor dem Download..."

COM_OSDOWNLOADS_CATEGORY = "Category"
COM_OSDOWNLOADS_CLICK_TO_DOWNLOAD_FILE = "Wenn der Download nicht automatisch startet, bitte hier klicken <a href='{{download_url}}'>hier</a> zum Download."
COM_OSDOWNLOADS_CLICK_TO_DOWNLOAD_FILE_IOS = "Sie nutzen ein iOS Gerät. Deshalb startet der Download nicht automatisch.<br><br>Bitte klicken Sie<a href='{{download_url}}' target='_blank'>hier</a> zum Download."
COM_OSDOWNLOADS_CONTACT_ADMIN = "Please report this to the site administrator"
Expand Down
1 change: 1 addition & 0 deletions src/site/language/en-GB/en-GB.com_osdownloads.ini
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

COM_OSDOWNLOADS_BEFORE_DOWNLOAD = "Before download..."

COM_OSDOWNLOADS_CATEGORY = "Category"
COM_OSDOWNLOADS_CLICK_TO_DOWNLOAD_FILE = "If your download doesn't start automatically, please click <a href='{{download_url}}'>here</a> to download."
COM_OSDOWNLOADS_CLICK_TO_DOWNLOAD_FILE_IOS = "You are on an iOS device so the download won't start automatically.<br><br>Please, click <a href='{{download_url}}' target='_blank'>here</a> to download."
COM_OSDOWNLOADS_CONTACT_ADMIN = "Please report this to the site administrator"
Expand Down
1 change: 1 addition & 0 deletions src/site/language/es-ES/es-ES.com_osdownloads.ini
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

COM_OSDOWNLOADS_BEFORE_DOWNLOAD = "Antes de descargar ..."

COM_OSDOWNLOADS_CATEGORY = "Categoría"
COM_OSDOWNLOADS_CLICK_TO_DOWNLOAD_FILE = "Si la descarga del archivo no se inicia aumaticamente, por favor haga click <a href='{{download_url}}'>here</a> para comenzar la misma."
COM_OSDOWNLOADS_CLICK_TO_DOWNLOAD_FILE_IOS = "Usted está en un dispositivo iOS por lo cual la descarga no comenzará en forma automática.<br><br>Por favor, click en <a href='{{download_url}}' target='_blank'>here</a> para comenzar la descarga."
COM_OSDOWNLOADS_CONTACT_ADMIN = "Por favor reporte esto al administrador del sitio"
Expand Down
1 change: 1 addition & 0 deletions src/site/language/fa-IR/fa-IR.com_osdownloads.ini
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

COM_OSDOWNLOADS_BEFORE_DOWNLOAD = "قبل از دانلود..."

COM_OSDOWNLOADS_CATEGORY = "Category"
COM_OSDOWNLOADS_CLICK_TO_DOWNLOAD_FILE = "اگر دانلود شما بصورت خودکار شروع نشد ،لطفاً <a href='{{download_url}}'>اینجا</a> را برای دانلود کلیک کنید."
COM_OSDOWNLOADS_CLICK_TO_DOWNLOAD_FILE_IOS = "You are on an iOS device so the download won't start automatically.<br><br>Please, click <a href='{{download_url}}' target='_blank'>here</a> to download."
COM_OSDOWNLOADS_CONTACT_ADMIN = "Please report this to the site administrator"
Expand Down
1 change: 1 addition & 0 deletions src/site/language/fr-FR/fr-FR.com_osdownloads.ini
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

COM_OSDOWNLOADS_BEFORE_DOWNLOAD = "Avant de télécharger..."

COM_OSDOWNLOADS_CATEGORY = "Catégorie"
COM_OSDOWNLOADS_CLICK_TO_DOWNLOAD_FILE = "Si votre téléchargement ne commence pas automatiquement, veuillez cliquer <a href='{{download_url}}'>ici</a> pour télécharger."
COM_OSDOWNLOADS_CLICK_TO_DOWNLOAD_FILE_IOS = "You are on an iOS device so the download won't start automatically.<br><br>Please, click <a href='{{download_url}}' target='_blank'>here</a> to download."
COM_OSDOWNLOADS_CONTACT_ADMIN = "Please report this to the site administrator"
Expand Down
1 change: 1 addition & 0 deletions src/site/language/pt-BR/pt-BR.com_osdownloads.ini
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

COM_OSDOWNLOADS_BEFORE_DOWNLOAD = "Antes de fazer o download..."

COM_OSDOWNLOADS_CATEGORY = "Categoria"
COM_OSDOWNLOADS_CLICK_TO_DOWNLOAD_FILE = "Se seu download não iniciar automaticamente, por favor clique <a href='{{download_url}}'>aqui</a> para fazer o download."
COM_OSDOWNLOADS_CLICK_TO_DOWNLOAD_FILE_IOS = "Você está em um dispositivo iOS então o download não começará automaticamente.<br><br>Por favor, clique <a href='{{download_url}}' target='_blank'>aqui</a> para fazer o download."
COM_OSDOWNLOADS_CONTACT_ADMIN = "Por favor relate isso ao administrador do site"
Expand Down
65 changes: 28 additions & 37 deletions src/site/views/item/tmpl/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

defined('_JEXEC') or die();

use Alledia\Framework\Helper as AllediaHelper;
use Alledia\OSDownloads\Free\Factory;
use Alledia\OSDownloads\Free\Joomla\Component\Site as FreeComponentSite;

Expand All @@ -48,90 +47,83 @@
) :
?>
<div class="page-header">
<h1> <?php echo $this->escape($this->params->get('page_heading')); ?> </h1>
<h1>
<?php echo $this->escape($this->params->get('page_heading')); ?>
</h1>
</div>
<?php
endif;
?>
<?php endif; ?>

<h2><?php echo($this->item->name); ?></h2>

<?php echo $this->item->event->afterDisplayTitle; ?>

<?php
if ($this->params->get("show_category", 0) && is_object($this->category)) :
if ($this->params->get('show_category', 0) && is_object($this->category)) :
?>
<div class="cate_info">
Category:
<?php echo JText::_('COM_OSDOWNLOADS_CATEGORY') . ':'; ?>
<a href="<?php echo JRoute::_($container->helperRoute->getFileListRoute($this->category->id)); ?>">
<?php echo $this->category->title; ?>
</a>
</div>
<?php
endif;
if ($this->params->get("show_download_count", 0)) :
?>
<div><?php echo(JText::_("COM_OSDOWNLOADS_DOWNLOADED")); ?>: <?php echo($this->item->downloaded); ?></div>
<?php
endif;
?>
<?php endif;

<?php echo $this->item->event->beforeDisplayContent; ?>
if ($this->params->get('show_download_count', 0)) :
?>
<div><?php echo(JText::_('COM_OSDOWNLOADS_DOWNLOADED')); ?>: <?php echo($this->item->downloaded); ?></div>
<?php endif;

echo $this->item->event->beforeDisplayContent;
?>
<div class="reference">
<?php
if ($this->item->documentation_link) :
?>
<div class="osdownloads-readmore readmore">
<a href="<?php echo($this->item->documentation_link); ?>">
<?php echo(JText::_("COM_OSDOWNLOADS_DOCUMENTATION")); ?>
<?php echo(JText::_('COM_OSDOWNLOADS_DOCUMENTATION')); ?>
</a>
</div>
<?php
endif;
<?php endif;

if ($this->item->demo_link) :
?>
<div class="osdownloads-readmore readmore">
<a href="<?php echo($this->item->demo_link); ?>">
<?php echo(JText::_("COM_OSDOWNLOADS_DEMO")); ?>
<?php echo(JText::_('COM_OSDOWNLOADS_DEMO')); ?>
</a>
</div>
<?php
endif;
<?php endif;

if ($this->item->support_link) :
?>
<div class="osdownloads-readmore readmore">
<a href="<?php echo($this->item->support_link); ?>">
<?php echo(JText::_("COM_OSDOWNLOADS_SUPPORT")); ?>
<?php echo(JText::_('COM_OSDOWNLOADS_SUPPORT')); ?>
</a>
</div>
<?php
endif;
<?php endif;

if ($this->item->other_link) :
?>
<div class="osdownloads-readmore readmore">
<a href="<?php echo($this->item->other_link); ?>">
<?php echo($this->item->other_name); ?>
</a>
</div>
<?php
endif;
?>
<?php endif; ?>
<div class="clr"></div>
</div>
<?php
if ($this->item->brief || $this->item->description_1) :
?>
<div class="description1"><?php echo($this->item->brief . $this->item->description_1); ?></div>
<?php
endif;
<?php endif;

if ($this->item->description_2) :
?>
<div class="description2"><?php echo($this->item->description_2); ?></div>
<?php
endif;
?>
<?php endif; ?>
<div class="osdownloadsactions">
<div class="btn_download">
<?php echo JLayoutHelper::render('buttons.download', $this); ?>
Expand All @@ -142,9 +134,8 @@
if ($this->item->description_3) :
?>
<div><?php echo($this->item->description_3); ?></div>
<?php
endif;
?>
<?php endif;

<?php echo $this->item->event->afterDisplayContent; ?>
echo $this->item->event->afterDisplayContent;
?>
</div>

0 comments on commit fd3958c

Please sign in to comment.