TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/thelia/thelia

Browse Source 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Template.php
This commit is contained in:
Franck Allimant
2013-11-06 11:16:27 +01:00
parent 361e4a9d74 9685fa95dc
commit ead038723f
102 changed files with 2709 additions and 2451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1606
templates/admin/default/I18n/fr_FR.php
View File

File diff suppressed because it is too large Load Diff

2
templates/admin/default/translations.html
View File

@@ -179,7 +179,7 @@
<td class="col-md-6">
<div class="input-group">
<span class="input-group-addon"><a href="#" data-hash="{$hash}" class="copy-translation"><span class="glyphicon glyphicon-chevron-right"></span></a></span>
<span class="input-group-addon"><a href="#" data-hash="{$hash}" class="copy-translation" title="{intl l='Copy source text in input field'}"><span class="glyphicon glyphicon-chevron-right"></span></a></span>
<input type="text" class="translation_field form-control" name="{$hash}" value="{$translated_strings[$info.chaine]}" />
</div>
</td>