Author: david
Date: Tue Nov 15 14:20:53 2011
New Revision: 10332
Log:
Merge -r10318:10331 from trunk
Modified:
branches/dcb/ (props changed)
branches/dcb/apps/qubit/modules/menu/actions/editAction.class.php
branches/dcb/apps/qubit/templates/_header.php
branches/dcb/apps/qubit/templates/layout.php
branches/dcb/data/fixtures/menus.yml
branches/dcb/data/fixtures/taxonomyTerms.yml
branches/dcb/images/logo.png (props changed)
branches/dcb/plugins/qbAclPlugin/lib/vendor/Zend/ (props changed)
branches/dcb/plugins/sfDrupalPlugin/vendor/drupal/ (props changed)
branches/dcb/vendor/symfony/ (props changed)
branches/dcb/vendor/symfony/lib/task/i18n/sfI18nExtractPluginTask.class.php
(props changed)
branches/dcb/vendor/yui/ (props changed)
branches/ica-atom/ (props changed)
branches/ica-atom/apps/qubit/modules/actor/actions/contextMenuComponent.class.php
(props changed)
branches/ica-atom/apps/qubit/modules/menu/actions/editAction.class.php
branches/ica-atom/apps/qubit/templates/_header.php
branches/ica-atom/apps/qubit/templates/layout.php
branches/ica-atom/data/fixtures/menus.yml
branches/ica-atom/data/fixtures/taxonomyTerms.yml
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/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/dcb/apps/qubit/modules/menu/actions/editAction.class.php
==============================================================================
--- branches/dcb/apps/qubit/modules/menu/actions/editAction.class.php Tue Nov
15 13:49:04 2011 (r10331)
+++ branches/dcb/apps/qubit/modules/menu/actions/editAction.class.php Tue Nov
15 14:20:53 2011 (r10332)
@@ -152,8 +152,8 @@
// Remove cache
if ($this->context->getViewCacheManager() !== null)
{
-
$this->context->getViewCacheManager()->remove('@sf_cache_partial?module=menu&action=_browseMenu&sf_cache_key=settings');
-
$this->context->getViewCacheManager()->remove('@sf_cache_partial?module=menu&action=_mainMenu&sf_cache_key=settings');
+
$this->context->getViewCacheManager()->remove('@sf_cache_partial?module=menu&action=_browseMenu&sf_cache_key='.$this->context->getUser()->getCulture());
+
$this->context->getViewCacheManager()->remove('@sf_cache_partial?module=menu&action=_mainMenu&sf_cache_key='.$this->context->getUser()->getCulture());
}
$this->redirect(array('module' => 'menu', 'action' => 'list'));
Modified: branches/dcb/apps/qubit/templates/_header.php
==============================================================================
--- branches/dcb/apps/qubit/templates/_header.php Tue Nov 15 13:49:04
2011 (r10331)
+++ branches/dcb/apps/qubit/templates/_header.php Tue Nov 15 14:20:53
2011 (r10332)
@@ -35,4 +35,4 @@
<?php echo get_component('search', 'box') ?>
-<?php echo get_component('menu', 'browseMenu', array('sf_cache_key' =>
'settings')) ?>
+<?php echo get_component('menu', 'browseMenu', array('sf_cache_key' =>
$sf_user->getCulture())) ?>
Modified: branches/dcb/apps/qubit/templates/layout.php
==============================================================================
--- branches/dcb/apps/qubit/templates/layout.php Tue Nov 15 13:49:04
2011 (r10331)
+++ branches/dcb/apps/qubit/templates/layout.php Tue Nov 15 14:20:53
2011 (r10332)
@@ -22,7 +22,7 @@
<?php if ($sf_user->isAuthenticated()): ?>
<div id="navigation">
<div class="section">
- <?php echo get_component('menu', 'mainMenu',
array('sf_cache_key' => 'settings')) ?>
+ <?php echo get_component('menu', 'mainMenu',
array('sf_cache_key' => $sf_user->getCulture())) ?>
</div> <!-- /.section -->
</div> <!-- /#navigation -->
<?php endif; ?>
Modified: branches/dcb/data/fixtures/menus.yml
==============================================================================
--- branches/dcb/data/fixtures/menus.yml Tue Nov 15 13:49:04 2011
(r10331)
+++ branches/dcb/data/fixtures/menus.yml Tue Nov 15 14:20:53 2011
(r10332)
@@ -493,8 +493,8 @@
source_culture: en
name: browseRepositories
label:
- en: Organizations
- fr: Organisations
+ en: Organizations
+ fr: Organisations
path: repository/browse
QubitMenu_browse_subjects:
parent_id: QubitMenu_browse
@@ -502,6 +502,7 @@
name: browseSubjects
label:
en: Subjects
+ fr: Sujets
path: 'taxonomy/browse?id=35'
QubitMenu_browse_places:
parent_id: QubitMenu_browse
@@ -509,6 +510,7 @@
name: browsePlaces
label:
en: Places
+ fr: Lieux
path: 'taxonomy/browse?id=42'
QubitMenu_browse_digital_objects:
parent_id: QubitMenu_browse
@@ -516,4 +518,5 @@
name: browseDigitalObjects
label:
en: 'Digital objects'
+ fr: 'Objet numérique'
path: digitalobject/list
Modified: branches/dcb/data/fixtures/taxonomyTerms.yml
==============================================================================
--- branches/dcb/data/fixtures/taxonomyTerms.yml Tue Nov 15 13:49:04
2011 (r10331)
+++ branches/dcb/data/fixtures/taxonomyTerms.yml Tue Nov 15 14:20:53
2011 (r10332)
@@ -2136,9 +2136,9 @@
source_culture: en
name:
de: Sammlung
- en: collection
+ en: Collection
es: Colección
- fr: collection
+ fr: Collection
it: collezione
nl: Collectie
pt: Coleção
Modified: branches/ica-atom/apps/qubit/modules/menu/actions/editAction.class.php
==============================================================================
--- branches/ica-atom/apps/qubit/modules/menu/actions/editAction.class.php
Tue Nov 15 13:49:04 2011 (r10331)
+++ branches/ica-atom/apps/qubit/modules/menu/actions/editAction.class.php
Tue Nov 15 14:20:53 2011 (r10332)
@@ -152,8 +152,8 @@
// Remove cache
if ($this->context->getViewCacheManager() !== null)
{
-
$this->context->getViewCacheManager()->remove('@sf_cache_partial?module=menu&action=_browseMenu&sf_cache_key=settings');
-
$this->context->getViewCacheManager()->remove('@sf_cache_partial?module=menu&action=_mainMenu&sf_cache_key=settings');
+
$this->context->getViewCacheManager()->remove('@sf_cache_partial?module=menu&action=_browseMenu&sf_cache_key='.$this->context->getUser()->getCulture());
+
$this->context->getViewCacheManager()->remove('@sf_cache_partial?module=menu&action=_mainMenu&sf_cache_key='.$this->context->getUser()->getCulture());
}
$this->redirect(array('module' => 'menu', 'action' => 'list'));
Modified: branches/ica-atom/apps/qubit/templates/_header.php
==============================================================================
--- branches/ica-atom/apps/qubit/templates/_header.php Tue Nov 15 13:49:04
2011 (r10331)
+++ branches/ica-atom/apps/qubit/templates/_header.php Tue Nov 15 14:20:53
2011 (r10332)
@@ -35,4 +35,4 @@
<?php echo get_component('search', 'box') ?>
-<?php echo get_component('menu', 'browseMenu', array('sf_cache_key' =>
'settings')) ?>
+<?php echo get_component('menu', 'browseMenu', array('sf_cache_key' =>
$sf_user->getCulture())) ?>
Modified: branches/ica-atom/apps/qubit/templates/layout.php
==============================================================================
--- branches/ica-atom/apps/qubit/templates/layout.php Tue Nov 15 13:49:04
2011 (r10331)
+++ branches/ica-atom/apps/qubit/templates/layout.php Tue Nov 15 14:20:53
2011 (r10332)
@@ -22,7 +22,7 @@
<?php if ($sf_user->isAuthenticated()): ?>
<div id="navigation">
<div class="section">
- <?php echo get_component('menu', 'mainMenu',
array('sf_cache_key' => 'settings')) ?>
+ <?php echo get_component('menu', 'mainMenu',
array('sf_cache_key' => $sf_user->getCulture())) ?>
</div> <!-- /.section -->
</div> <!-- /#navigation -->
<?php endif; ?>
Modified: branches/ica-atom/data/fixtures/menus.yml
==============================================================================
--- branches/ica-atom/data/fixtures/menus.yml Tue Nov 15 13:49:04 2011
(r10331)
+++ branches/ica-atom/data/fixtures/menus.yml Tue Nov 15 14:20:53 2011
(r10332)
@@ -211,11 +211,11 @@
label:
de: Funktion
en: Function
- es: Función
- fr: Fonction
- nl: Functie
+ es: Funciones
+ fr: Fonctions
+ nl: Functies
pl: Funkcja
- sl: Funkcija
+ sl: Funkcij
path: function/add
QubitMenu_mainmenu_import_xml:
parent_id: QubitMenu_mainmenu_import
Modified: branches/ica-atom/data/fixtures/taxonomyTerms.yml
==============================================================================
--- branches/ica-atom/data/fixtures/taxonomyTerms.yml Tue Nov 15 13:49:04
2011 (r10331)
+++ branches/ica-atom/data/fixtures/taxonomyTerms.yml Tue Nov 15 14:20:53
2011 (r10332)
@@ -2136,9 +2136,9 @@
source_culture: en
name:
de: Sammlung
- en: collection
+ en: Collection
es: Colección
- fr: collection
+ fr: Collection
it: collezione
nl: Collectie
pt: Coleção
--
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.
