hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2184-list-manager-email-domain-filter

Browse Source
This commit is contained in:
aynsix
2020-04-22 13:58:02 +03:00
parent 620943c2cf 90cd595834
commit ada4702d92
14 changed files with 742 additions and 814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/web/prod/Share/record.html.twig
View File

@@ -17,7 +17,7 @@
</span>
</p>
<p>
<a id="twitter-link" href="http://www.twitter.com/home/?status={{ subdefList[defKey].permaviewUrl }}"
<a id="twitter-link" href="https://twitter.com/intent/tweet?text={{ subdefList[defKey].permaviewUrl }}"
target="_blank">
<img src="/assets/common/images/icons/twitter.png" title="share this on twitter"
style="width:25px;vertical-align:middle;padding:0 5px;"/>

4
templates/web/prod/WorkZone/Basket.html.twig
View File

@@ -161,10 +161,10 @@
});
$( function() {
$.datepicker.regional['default'] = {
closeText: "{{ 'workzone:datepicker:closeText' | trans }}",
closeText: "Close",
prevText: "{{ 'workzone:datepicker:prevText' | trans }}",
nextText: "{{ 'workzone:datepicker:nextText' | trans }}",
currentText: "{{ 'workzone:datepicker:currentText' | trans }}",
currentText: "Today",
monthNames: [ "{{ 'workzone:datepicker:january' | trans }}", "{{ 'workzone:datepicker:february' | trans }}", "{{ 'workzone:datepicker:march' | trans }}", "{{ 'workzone:datepicker:april' | trans }}", "{{ 'workzone:datepicker:may' | trans }}", "{{ 'workzone:datepicker:june' | trans }}",
"{{ 'workzone:datepicker:july' | trans }}", "{{ 'workzone:datepicker:august' | trans }}", "{{ 'workzone:datepicker:september' | trans }}", "{{ 'workzone:datepicker:october' | trans }}", "{{ 'workzone:datepicker:november' | trans }}", "{{ 'workzone:datepicker:december' | trans }}" ],
dayNames: [ "{{ 'workzone:datepicker:sunday' | trans }}", "{{ 'workzone:datepicker:monday' | trans }}", "{{ 'workzone:datepicker:tuesday' | trans }}", "{{ 'workzone:datepicker:wednesday' | trans }}", "{{ 'workzone:datepicker:thursday' | trans }}", "{{ 'workzone:datepicker:friday' | trans }}", "{{ 'workzone:datepicker:saturday' | trans }}" ],

10
templates/web/prod/WorkZone/Browser/Results.html.twig
View File

@@ -4,9 +4,13 @@
<table>
<tr>
<td>
{% transchoice Total %}
{0} No results|{1} Result|]1,Inf[ Results
{% endtranschoice %}
{% if Total == 0 %}
{{ 'No results' | trans }}
{% elseif Total == 1 %}
{{ '1 result' | trans }}
{% else %}
{% trans with {'%Total%' : Total} %}%Total% results{% endtrans %}
{% endif %}
</td>
</tr>
</table>