Author: david
Date: Mon Aug 27 15:14:26 2012
New Revision: 12225
Log:
Merge r12221:12224 from trunk
Modified:
branches/ica-atom/ (props changed)
branches/ica-atom/apps/qubit/modules/actor/actions/contextMenuComponent.class.php
(props changed)
branches/ica-atom/favicon.ico (props changed)
branches/ica-atom/images/logo.png (props changed)
branches/ica-atom/plugins/qbAclPlugin/lib/vendor/Zend/ (props changed)
branches/ica-atom/plugins/qtAccessionPlugin/modules/accession/templates/editSuccess.php
branches/ica-atom/plugins/qtAccessionPlugin/modules/accession/templates/indexSuccess.php
branches/ica-atom/plugins/sfDrupalPlugin/vendor/drupal/ (props changed)
branches/ica-atom/vendor/symfony/ (props changed)
branches/ica-atom/vendor/symfony/lib/task/i18n/sfI18nExtractPluginTask.class.php
(props changed)
branches/ica-atom/vendor/yui/ (props changed)
Modified:
branches/ica-atom/plugins/qtAccessionPlugin/modules/accession/templates/editSuccess.php
==============================================================================
---
branches/ica-atom/plugins/qtAccessionPlugin/modules/accession/templates/editSuccess.php
Mon Aug 27 15:04:51 2012 (r12224)
+++
branches/ica-atom/plugins/qtAccessionPlugin/modules/accession/templates/editSuccess.php
Mon Aug 27 15:14:26 2012 (r12225)
@@ -114,11 +114,11 @@
<fieldset class="collapsible collapsed" id="informationObjectArea">
- <legend><?php echo __('Information object area') ?></legend>
+ <legend><?php echo __('%1% area', array('%1%' =>
sfConfig::get('app_ui_label_informationobject'))) ?></legend>
<div class="form-item">
<?php echo $form->informationObjects
- ->label(__('Information objects'))
+ ->label(sfConfig::get('app_ui_label_informationobject'))
->renderLabel() ?>
<?php echo $form->informationObjects->render(array('class' =>
'form-autocomplete')) ?>
<?php if (QubitAcl::check(QubitActor::getRoot(), 'create')): ?>
Modified:
branches/ica-atom/plugins/qtAccessionPlugin/modules/accession/templates/indexSuccess.php
==============================================================================
---
branches/ica-atom/plugins/qtAccessionPlugin/modules/accession/templates/indexSuccess.php
Mon Aug 27 15:04:51 2012 (r12224)
+++
branches/ica-atom/plugins/qtAccessionPlugin/modules/accession/templates/indexSuccess.php
Mon Aug 27 15:14:26 2012 (r12225)
@@ -108,12 +108,12 @@
<div class="section" id="informationObjectArea">
- <h2><?php echo __('Information object area') ?></h2>
+ <h2><?php echo __('%1% area', array('%1%' =>
sfConfig::get('app_ui_label_informationobject'))) ?></h2>
<?php foreach (QubitRelation::getRelationsByObjectId($resource->id,
array('typeId' => QubitTerm::ACCESSION_ID)) as $item): ?>
<div class="field">
- <h3><?php echo __('Information object') ?></h3>
+ <h3><?php echo sfConfig::get('app_ui_label_informationobject') ?></h3>
<div>
<?php echo link_to(render_title($item->subject), array($item->subject,
'module' => 'informationobject')) ?>
</div>
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
