Skip to content
This repository has been archived by the owner on Jan 31, 2020. It is now read-only.

Commit

Permalink
Aligned method naming to zf style
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniele Princiotta committed Aug 17, 2013
1 parent 7c93cab commit 77fce7b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/Helper/Navigation/AbstractHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -397,8 +397,8 @@ public function htmlify(AbstractPage $page)
$title = $page->getTitle();

if (null !== ($translator = $this->getTranslator())) {
if (null === ($textDomain = $page->getTextdomain())) {
$textDomain = $this->getTranslatorTextdomain();
if (null === ($textDomain = $page->getTextDomain())) {
$textDomain = $this->getTranslatorTextDomain();
}
if (is_string($label) && !empty($label)) {
$label = $translator->translate($label, $textDomain);
Expand Down
4 changes: 2 additions & 2 deletions src/Helper/Navigation/Breadcrumbs.php
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ public function renderStraight($container = null)
} else {
$html = $active->getLabel();
if (null !== ($translator = $this->getTranslator())) {
if (null === ($textDomain = $active->getTextdomain())) {
$textDomain = $this->getTranslatorTextdomain();
if (null === ($textDomain = $active->getTextDomain())) {
$textDomain = $this->getTranslatorTextDomain();
}
$html = $translator->translate($html, $textDomain);
}
Expand Down
4 changes: 2 additions & 2 deletions src/Helper/Navigation/Menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -477,8 +477,8 @@ public function htmlify(AbstractPage $page, $escapeLabel = true, $addClassToList

// translate label and title?
if (null !== ($translator = $this->getTranslator())) {
if (null === ($textDomain = $page->getTextdomain())) {
$textDomain = $this->getTranslatorTextdomain();
if (null === ($textDomain = $page->getTextDomain())) {
$textDomain = $this->getTranslatorTextDomain();
}
if (is_string($label) && !empty($label)) {
$label = $translator->translate($label, $textDomain);
Expand Down

0 comments on commit 77fce7b

Please sign in to comment.