Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enabled loading of active theme translations #6162

Merged

Conversation

@mickaelandrieu
Copy link
Member

commented Sep 5, 2016

Questions Answers
Branch? develop
Description? Translations from active theme should be loaded in front office
Type? new feature
Category? FO
BC breaks? no
Deprecations? no
How to test? Copy paste classic theme and rename it classic 2 (and update config file too). If you add a new translation key, it should be loaded.

Important guidelines

@mickaelandrieu mickaelandrieu force-pushed the mickaelandrieu:display-theme-catalog branch Sep 5, 2016

@mickaelandrieu mickaelandrieu force-pushed the mickaelandrieu:display-theme-catalog branch to e369072 Sep 5, 2016

@mickaelandrieu mickaelandrieu changed the title Enable loading of active theme translations Enabled loading of active theme translations Sep 5, 2016

@julienbourdeau julienbourdeau merged commit 3b746e3 into PrestaShop:develop Sep 5, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@mickaelandrieu mickaelandrieu deleted the mickaelandrieu:display-theme-catalog branch Sep 5, 2016

@@ -344,12 +344,18 @@ public function getTranslator()
$this->translator->addLoader('xlf', new XliffFileLoader);
$this->translator->addLoader('db', new SqlTranslationLoader);
$locations = array(_PS_ROOT_DIR_.'/app/Resources/translations');
$activeThemeLocation = _PS_ROOT_DIR_.'/themes/'.$this->shop->theme_name.'/translations';

This comment has been minimized.

Copy link
@maximebiloe

maximebiloe Sep 5, 2016

Contributor

It causes a warning during installation. Undefined object shop.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.