Skip to content

Commit 600173b

Browse files
author
zanardi
committed
Refs #6456
1 parent fb4873c commit 600173b

File tree

4 files changed

+23
-15
lines changed

4 files changed

+23
-15
lines changed

build/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
project.name = pizzabox
22
component.name = com_pizzabox
33
path.deploy.local = /var/www/joomla30
4-
current.version = v3.3.0_BETA
4+
current.version = v3.3.1

component/frontend/language/en-GB.com_pizzabox.ini

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
; @version en-GB.com_pizzabox.ini 2013-11-23 22:48:00 UTC zanardi
1+
; @version en-GB.com_pizzabox.ini 2014-02-15 11:05:00 UTC zanardi
22
; @package GiBi PizzaBox
33
; @author GiBiLogic <[email protected]>
44
; @authorUrl http://www.gibilogic.com
5-
; @copyright (C) 2011-2013 GiBiLogic. All rights reserved.
6-
; @license GNU/GPL v2 or later
5+
; @copyright (C) 2011-2014 GiBiLogic. All rights reserved.
6+
; @license GNU/GPL v3 or later
77
; @description en-GB frontend language file
88

99
; General
@@ -41,6 +41,10 @@ PIZZABOX_ITEMS_PER_PAGE="Items per page"
4141
PIZZABOX_PAYPAL="Pay with PayPal"
4242
PIZZABOX_ORDER_TOTAL="Order total"
4343

44+
; Flavours
45+
PIZZABOX_FLAVOURS_SELECT_FROM_TO="(select from %s to %s)"
46+
PIZZABOX_FLAVOURS_SELECT_NUMBER="(select %s)"
47+
4448
PIZZABOX_DELIVERY_ADDRESS="Delivery address (optional)"
4549
PIZZABOX_DELIVERY_ADDRESS_EMPTY="New"
4650
PIZZABOX_DELIVERY_ADDRESS_NAME="Name"

component/frontend/language/it-IT.com_pizzabox.ini

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
; @version it-IT.com_pizzabox.ini 2013-11-23 22:48:00 UTC zanardi
1+
; @version it-IT.com_pizzabox.ini 2014-02-15 11:05:00 UTC zanardi
22
; @package GiBi PizzaBox
33
; @author GiBiLogic <[email protected]>
44
; @authorUrl http://www.gibilogic.com
5-
; @copyright (C) 2011-2013 GiBiLogic. All rights reserved.
6-
; @license GNU/GPL v2 or later
5+
; @copyright (C) 2011-2014 GiBiLogic. All rights reserved.
6+
; @license GNU/GPL v3 or later
77
; @description it-IT frontend language file
88

99
; General
@@ -41,6 +41,10 @@ PIZZABOX_ITEMS_PER_PAGE="Elementi per pagina"
4141
PIZZABOX_PAYPAL="Paga con PayPal"
4242
PIZZABOX_ORDER_TOTAL="Totale ordine"
4343

44+
; Flavours
45+
PIZZABOX_FLAVOURS_SELECT_FROM_TO="(scegli da %s a %s)"
46+
PIZZABOX_FLAVOURS_SELECT_NUMBER="(scegli %s)"
47+
4448
PIZZABOX_DELIVERY_ADDRESS="Indirizzo di consegna (opzionale)"
4549
PIZZABOX_DELIVERY_ADDRESS_EMPTY="Nuovo"
4650
PIZZABOX_DELIVERY_ADDRESS_NAME="Nome"

component/frontend/views/parts/tmpl/default.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
<?php
22

33
/**
4-
* @version $Id: views/parts/tmpl/default.php 2012-08-19 09:50:00Z zanardi $
4+
* @version frontend/views/parts/tmpl/default.php 2014-02-15 11:03:00 UTC zanardi
55
* @package GiBi PizzaBox
6-
* @author GiBiLogic snc
7-
* @authorEmail [email protected]
6+
* @author GiBiLogic <[email protected]>
87
* @authorUrl http://www.gibilogic.com
9-
* @copyright Copyright (C) 2011-2012 GiBiLogic. All rights reserved.
10-
* @license GNU/GPL v2 or later
8+
* @copyright (C) 2011-2014 GiBiLogic snc. All rights reserved.
9+
* @license GNU/GPL v3 or later
1110
*/
1211

13-
defined('_JEXEC') or die('The way is shut!');
12+
defined('_JEXEC') or die();
1413

1514
?>
1615
<h1><?php echo JText::_('PIZZABOX_FLAVOURS_SELECT') ?></h1>
@@ -32,10 +31,11 @@
3231
<h2>
3332
<?php echo $part->name ?><?php echo $part->price > 0 ? ', +' . $this->helper->formatPrice($part->price) : '' ?>
3433
<?php if ($part->minimum == $part->maximum): ?>
35-
&nbsp;(select <?php echo $part->minimum ?>)</h2>
34+
<?php echo JText::sprintf('PIZZABOX_FLAVOURS_SELECT_NUMBER', $part->minimum) ?>
3635
<?php else: ?>
37-
&nbsp;(select from <?php echo $part->minimum ?> to <?php echo $part->maximum ?>)</h2>
36+
<?php echo JText::sprintf('PIZZABOX_FLAVOURS_SELECT_FROM_TO', $part->minimum, $part->maximum) ?>
3837
<?php endif; ?>
38+
</h2>
3939
<ul class="thumbnails thumbnails-flavours">
4040
<?php foreach ($this->lists['flavours'] as $flavour): ?>
4141
<?php if (false !== strrpos($flavour->parts, '"' . $part->id . '"')): ?>

0 commit comments

Comments
 (0)