diff --git a/src/JDA/CoreBundle/Resources/translations/messages.en.xliff b/src/JDA/CoreBundle/Resources/translations/messages.en.xliff index 911ca0fa..9b24f5f8 100755 --- a/src/JDA/CoreBundle/Resources/translations/messages.en.xliff +++ b/src/JDA/CoreBundle/Resources/translations/messages.en.xliff @@ -1,4 +1,4 @@ - + @@ -1961,6 +1961,14 @@ prompt those of us who were not affected to reflect on the way we live our lives jda.my.wakuInformational Construct a media rich narrative using this collection on the Waku. Waku is a story telling platform for curation and presentation, give it a try! + + jda.form.contribute.language.french + French + + + jda.form.contribute.language.others + Others + diff --git a/src/JDA/CoreBundle/Resources/translations/messages.ja.xliff b/src/JDA/CoreBundle/Resources/translations/messages.ja.xliff index 352b01af..134dcae2 100755 --- a/src/JDA/CoreBundle/Resources/translations/messages.ja.xliff +++ b/src/JDA/CoreBundle/Resources/translations/messages.ja.xliff @@ -1,4 +1,4 @@ - + @@ -1986,6 +1986,14 @@ JDAの基本コンセプトの紹介ビデオ、及び使用説明ビデオ・ jda.my.wakuInformational Waku使うことによって、このコレクションをマルチメディアな物語へと構築することができます。Wakuはキュレートされた震災記録から個人の物語を紡ぎ、発表、シェアできるプラットフォームです。ぜひお試しください! + + jda.form.contribute.language.french + フランス語 + + + jda.form.contribute.language.others + その他 + diff --git a/src/JDA/CoreBundle/Resources/views/Forms/seedSubmit.html.twig b/src/JDA/CoreBundle/Resources/views/Forms/seedSubmit.html.twig index 9ee8632b..784a446e 100644 --- a/src/JDA/CoreBundle/Resources/views/Forms/seedSubmit.html.twig +++ b/src/JDA/CoreBundle/Resources/views/Forms/seedSubmit.html.twig @@ -123,6 +123,8 @@ {% trans %}jda.form.contribute.language.japanese{% endtrans %} {% trans %}jda.form.contribute.language.chinese{% endtrans %} {% trans %}jda.form.contribute.language.korean{% endtrans %} + {% trans %}jda.form.contribute.language.french{% endtrans %} + {% trans %}jda.form.contribute.language.others{% endtrans %} diff --git a/src/JDA/CoreBundle/Resources/views/Search/search.html.twig b/src/JDA/CoreBundle/Resources/views/Search/search.html.twig index 92188604..56413e40 100755 --- a/src/JDA/CoreBundle/Resources/views/Search/search.html.twig +++ b/src/JDA/CoreBundle/Resources/views/Search/search.html.twig @@ -4,7 +4,7 @@ {% block title %}{% trans %}jda.home.title{% endtrans %}{% endblock %} - + {% block stylesheets %} @@ -94,13 +94,13 @@ body { - - + + + - diff --git a/src/JDA/CoreBundle/Resources/views/Team/team.html.twig b/src/JDA/CoreBundle/Resources/views/Team/team.html.twig index c4f58ac9..e96ef775 100755 --- a/src/JDA/CoreBundle/Resources/views/Team/team.html.twig +++ b/src/JDA/CoreBundle/Resources/views/Team/team.html.twig @@ -71,12 +71,13 @@ {% trans %}jda.team.webdeveloper.tyreke{% endtrans %}
{% trans %}jda.team.webdeveloper.kyle{% endtrans %}
{% trans %}jda.team.webdeveloper.jessica{% endtrans %}
+ Hi Hi Hi Hi Hi

{% trans %}jda.team.contentdevelopment{% endtrans %}

{% trans %}jda.team.content.lead{% endtrans %}
{% trans %}jda.team.content.developer{% endtrans %}
- {% trans %}jda.team.content.curation{% endtrans %}
+ {% trans %}jda.team.content.cu ration{% endtrans %}

{% trans %}jda.team.alumni{% endtrans %}

diff --git a/src/JDA/CoreBundle/Resources/views/Widget/widget.html.twig b/src/JDA/CoreBundle/Resources/views/Widget/widget.html.twig index 83fd250e..ae17c793 100644 --- a/src/JDA/CoreBundle/Resources/views/Widget/widget.html.twig +++ b/src/JDA/CoreBundle/Resources/views/Widget/widget.html.twig @@ -1,4 +1,4 @@ - + {# src/Zeega/\CoreBundle\/Resources/views/Widget/fail.widget.html.twig #} @@ -121,14 +121,15 @@
-

Language:

English / 英語
Japanese / 日本語
Chinese / 中国語
- Korean / 韓国語
+ Korean / 韓国語
+ French / フランス語
+ Others / その他
@@ -264,19 +265,19 @@ return; } - var checkboxes = document.getElementsByClassName("languageChk"); - var lent = checkboxes.length; - var checkedCount = 0; - for (i = 0; i < lent; i++) { - if (checkboxes[i].checked) { - checkedCount+=1; - } + var checkboxes = document.getElementsByClassName("languageChk"); + var lent = checkboxes.length; + var checkedCount = 0; + for (i = 0; i < lent; i++) { + if (checkboxes[i].checked) { + checkedCount+=1; } + } - if (checkedCount == 0) { - alert("Please select a language before submitting."); - return; - } + if (checkedCount == 0) { + alert("Please select a language before submitting."); + return; + } var Browser = jda.module("browser"); @@ -335,9 +336,11 @@ postObj.attributes.language = $("#englishChk").is(":checked") ? "English|" : ""; - postObj.attributes.language += $("#japaneseChk").is(":checked") ? "Japanese|" : ""; - postObj.attributes.language += $("#chineseChk").is(":checked") ? "Chinese|" : ""; - postObj.attributes.language += $("#koreanChk").is(":checked") ? "Korean|" : ""; + postObj.attributes.language += $("#japaneseChk").is(":checked") ? "Japanese|" : ""; + postObj.attributes.language += $("#chineseChk").is(":checked") ? "Chinese|" : ""; + postObj.attributes.language += $("#koreanChk").is(":checked") ? "Korean|" : ""; + postObj.attributes.language += $("#frenchChk").is(":checked") ? "French|" : ""; + postObj.attributes.language += $("#othersChk").is(":checked") ? "Others|" : ""; if ($("#lat").val() != "") { postObj.media_geo_latitude = parseFloat($("#lat").val()); diff --git a/web/js/loaders/form.js b/web/js/loaders/form.js index 15d72927..b25214eb 100644 --- a/web/js/loaders/form.js +++ b/web/js/loaders/form.js @@ -213,6 +213,8 @@ require(loadFiles, function () { postObj.attributes.language += $("#japaneseChk").is(":checked") ? "Japanese|" : ""; postObj.attributes.language += $("#chineseChk").is(":checked") ? "Chinese|" : ""; postObj.attributes.language += $("#koreanChk").is(":checked") ? "Korean|" : ""; + postObj.attributes.language += $("#frenchChk").is(":checked") ? "French|" : ""; + postObj.attributes.language += $("#othersChk").is(":checked") ? "Others|" : ""; postObj.published = 0; postObj.archive = "Seeds";