Author: bleny Date: 2011-01-13 08:55:58 +0000 (Thu, 13 Jan 2011) New Revision: 917 Log: add a button to change language in top menu Added: trunk/wao-ui/src/main/webapp/img/Flag_fr_gb.png trunk/wao-ui/src/main/webapp/img/source/Flag_fr_gb.svg Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java 2011-01-12 11:25:28 UTC (rev 916) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java 2011-01-13 08:55:58 UTC (rev 917) @@ -41,10 +41,12 @@ import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.ioc.Messages; import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.services.PersistentLocale; import org.apache.tapestry5.services.Request; import org.slf4j.Logger; import java.util.LinkedHashMap; +import java.util.Locale; import java.util.Map; import static org.nuiton.i18n.I18n._; @@ -203,11 +205,27 @@ } + /********************************* ACTIONS *******************************/ + @Log Object onActionFromExit() { serviceAuthentication.setConnectedUser(null); request.getSession(false).invalidate(); return Index.class; } + + @Inject + private PersistentLocale localeService; + + @Log + Object onActionFromChangeLocale() { + Locale currentLocale = localeService.get(); + if (Locale.FRENCH.equals(currentLocale)) { + localeService.set(Locale.ENGLISH); + } else { + localeService.set(Locale.FRENCH); + } + return this; + } } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java 2011-01-12 11:25:28 UTC (rev 916) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java 2011-01-13 08:55:58 UTC (rev 917) @@ -194,7 +194,7 @@ // you can extend this list of locales (it's a comma separated series of locale names; // the first locale name is the default when there's no reasonable match). - configuration.add(SymbolConstants.SUPPORTED_LOCALES, "fr"); + configuration.add(SymbolConstants.SUPPORTED_LOCALES, "fr,en"); // The factory default is true but during the early stages of an application // overriding to false is a good idea. In addition, this is often overridden Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2011-01-12 11:25:28 UTC (rev 916) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2011-01-13 08:55:58 UTC (rev 917) @@ -66,19 +66,22 @@ ${format:wao.ui.layout.userDescription=currentUser.fullName,currentUser.company.name,currentUser.profile.description} </div> <div id="user-actions" class="fright"> + <a t:type="actionlink" t:id="changeLocale" title="${message:wao.ui.action.changeLocale}"> + <img src="${asset:context:img/Flag_fr_gb.png}" alt="${message:wao.ui.action.changeLocale}" /> + </a> <a t:type="pagelink" t:page="index" title="${message:wao.ui.page.Index.title}"> - <img src="${asset:context:img/home.png}" alt="${message:wao.ui.page.Index.title}" title="${message:wao.ui.page.Index.title}" /> + <img src="${asset:context:img/home.png}" alt="${message:wao.ui.page.Index.title}" /> </a> <t:unless t:test="currentUser.guest"> <a t:type="pagelink" t:page="cartography" title="${message:wao.ui.page.Cartography.title}" target="_blank"> - <img src="${asset:context:img/cartography.png}" alt="${message:wao.ui.page.Cartography.title}" title="${message:wao.ui.page.Cartography.title}"/> + <img src="${asset:context:img/cartography.png}" alt="${message:wao.ui.page.Cartography.title}" /> </a> </t:unless> <a t:type="pagelink" t:page="userProfileForm" title="${message:wao.ui.page.UserProfileForm.title}"> - <img src="${asset:context:img/user.png}" alt="${message:wao.ui.page.UserProfileForm.title}" title="${message:wao.ui.page.UserProfileForm.title}"/> + <img src="${asset:context:img/user.png}" alt="${message:wao.ui.page.UserProfileForm.title}" /> </a> <a t:type="actionlink" t:id="exit" title="${message:wao.ui.action.logout}"> - <img src="${asset:context:img/exit.png}" alt="${message:wao.ui.action.logout}" title="${message:wao.ui.action.logout}"/> + <img src="${asset:context:img/exit.png}" alt="${message:wao.ui.action.logout}" /> </a> </div> </div> Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-01-12 11:25:28 UTC (rev 916) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-01-13 08:55:58 UTC (rev 917) @@ -3,22 +3,23 @@ wao.ui.action.addNewContactFromBoat=Create a new contact for this boat and the selected sample row (in filters) wao.ui.action.back=Back to previous screen wao.ui.action.cancel=Cancel +wao.ui.action.changeLocale=Change language wao.ui.action.contactAdmin=Contact an admin wao.ui.action.create=Create wao.ui.action.createCompany=Create a company wao.ui.action.createUser=Create a user wao.ui.action.delete=Delete wao.ui.action.deleteCompany=Delete company -wao.ui.action.deleteCompany.confirm=Are you sure you want to delete\\ this company ? +wao.ui.action.deleteCompany.confirm=Are you sure you want to delete this company ? wao.ui.action.deleteContact=Delete contact wao.ui.action.deleteContact.confirm=Are you sure you want to delete this contact ? wao.ui.action.deleteNews=Delete this news wao.ui.action.deleteNews.confirm=Are you sure you want to delete this news ? wao.ui.action.deleteUser=Delete this user -wao.ui.action.deleteUser.confirm=Are your sure you want to delete this\\ user ? +wao.ui.action.deleteUser.confirm=Are your sure you want to delete this user ? wao.ui.action.edit=Edit wao.ui.action.enlargeView=Enlarge view -wao.ui.action.exportBoats=Export boats with\\ private infos +wao.ui.action.exportBoats=Export boats with private infos wao.ui.action.filter=Filter wao.ui.action.hideFilters=Hide filters wao.ui.action.login=Connection @@ -37,26 +38,26 @@ wao.ui.action.showFilters=Show filters wao.ui.action.unvalidateContact=Unvalidate contact wao.ui.action.viewIndicatorsHistory=View indicators historic -wao.ui.boatList=List of\\ %s\\ boats +wao.ui.boatList=List of %s boats wao.ui.boatinfo.title=Infos about %s wao.ui.boats.associatedLine=Sample row(s) associated with this boat -wao.ui.boats.nbBoarding=%s boarding(s)\\ with\\ %s\\ with your company -wao.ui.contact.lastContact=Last contact\\ with\\ this\\ boat for your company -wao.ui.contacts.createFromBoat=Create a\\ new contact\\ for this\\ boat\\ and this sample\\ row -wao.ui.contacts.createFromBoat.fail=Contact\\ creation failed -wao.ui.contacts.createFromBoat.warn=Warning \:\\this sample-row is out of date, are your sure you want\\ to\\ create a new contact ? +wao.ui.boats.nbBoarding=%s boarding(s) with %s with your company +wao.ui.contact.lastContact=Last contact with this boat for your company +wao.ui.contacts.createFromBoat=Create a new contact for this boat and this sample row +wao.ui.contacts.createFromBoat.fail=Contact creation failed +wao.ui.contacts.createFromBoat.warn=Warning \:this sample-row is out of date, are your sure you want to create a new contact ? wao.ui.disclaimer=The website "SUIVI DU REALISE DU PLAN D'ECHANTILLONNAGE DES OBSERVATIONS A LA MER" is declared to the CNIL with the number \: 1414476 -wao.ui.disclaimer.boats=Data\\ your provide remains property of your\\ company.\\Outside your\\ company,\\ only an administrator may access\\ to your data for maintenance purpose. The administrator is\\ someone from\\ Ifremer. +wao.ui.disclaimer.boats=Data your provide remains property of your company.Outside your company, only an administrator may access to your data for maintenance purpose. The administrator is someone from Ifremer. wao.ui.email=e-mail address wao.ui.entity.Boat=Boat wao.ui.entity.Company=Company wao.ui.entity.Contact=Contact wao.ui.entity.SampleRow=Sample row wao.ui.entity.fishingGearDCF=Gear DCF code -wao.ui.entity.targetSpeciesDCF=Target species\\ DCF code +wao.ui.entity.targetSpeciesDCF=Target species DCF code wao.ui.field.Boat.boatLength=Length wao.ui.field.Boat.buildYear=Build year -wao.ui.field.Boat.capacity=Capacity of the ship in\\ specialized staff +wao.ui.field.Boat.capacity=Capacity of the ship in specialized staff wao.ui.field.Boat.districtCode=District wao.ui.field.Boat.immatriculation=Registration number wao.ui.field.Boat.name=Name @@ -75,8 +76,8 @@ wao.ui.field.Contact.dataReliability=Data reliability wao.ui.field.Contact.endDate=Observation end wao.ui.field.Contact.mainObserver=Main observer -wao.ui.field.Contact.mammalsCapture=Accidental\\ capture -wao.ui.field.Contact.mammalsObservation=Exceptional\\ observation +wao.ui.field.Contact.mammalsCapture=Accidental capture +wao.ui.field.Contact.mammalsObservation=Exceptional observation wao.ui.field.Contact.nbObservants=Observants number wao.ui.field.Contact.samplingStrategy=Sampling strategy followed wao.ui.field.Contact.secondaryObservers=Observers @@ -85,8 +86,8 @@ wao.ui.field.FishingZone.facadeName=Facade wao.ui.field.FishingZone.sectorName=Sector wao.ui.field.SampleRow.code=Line code -wao.ui.field.SampleRow.dcf5Code=DCF5\\ code -wao.ui.field.SampleRow.fishingZones=Fishing\\ zone(s) +wao.ui.field.SampleRow.dcf5Code=DCF5 code +wao.ui.field.SampleRow.fishingZones=Fishing zone(s) wao.ui.field.SampleRow.profession=Profession wao.ui.field.SampleRow.professionCode=Profession code wao.ui.field.SampleRow.programName=Program @@ -95,26 +96,26 @@ wao.ui.field.User.lastName=Last name wao.ui.field.User.login=Login wao.ui.field.UserProfile.userRole=Role -wao.ui.field.WaoUser.login=identifier +wao.ui.field.WaoUser.login=Identifier wao.ui.field.WaoUser.password=Password wao.ui.filters.filters=Search filters wao.ui.filters.refresh=Refresh filters wao.ui.forgotPassword=Forgot password ? -wao.ui.form.SampleRow.boatsDescription=This field\\ contains\\ registration numbers of\\ the ships\\ that are\\eligible for this ligne. You can\\ use any separator\\ to separate\\ numbers (space, dot, line-return, comma) -wao.ui.form.SampleRow.missingBeginDate=Begin date\\ missing to generate\\ line code -wao.ui.form.SampleRow.others=Others data of the\\ sample row +wao.ui.form.SampleRow.boatsDescription=This field contains registration numbers of the ships that areeligible for this ligne. You can use any separator to separate numbers (space, dot, line-return, comma) +wao.ui.form.SampleRow.missingBeginDate=Begin date missing to generate line code +wao.ui.form.SampleRow.others=Others data of the sample row wao.ui.form.SampleRow.program=Associated program and observation effort by months wao.ui.form.addComment=Add a comment -wao.ui.form.addRole=Add this r\u00F4le -wao.ui.form.boardingFrom=Boardings since\\ +wao.ui.form.addRole=Add this ru00F4le +wao.ui.form.boardingFrom=Boardings since wao.ui.form.contactsFile=Contacts file wao.ui.form.definePasswordManually=Define password manually wao.ui.form.editComment=Edit comment -wao.ui.form.editionAuthor=Modification's author\\ +wao.ui.form.editionAuthor=Modification's author wao.ui.form.estimatedTides=View estimated effort -wao.ui.form.estimatedTides.description=The estimated\\ observation effort\\ is\\ the number of contact that are\\ validated\\\\ by the company or not.\\ Contacts refused by program are ignored. +wao.ui.form.estimatedTides.description=The estimated observation effort is the number of contact that are validated by the company or not. Contacts refused by program are ignored. wao.ui.form.generatePassword=Generate password -wao.ui.form.otherBoatInfos=Other\\ boat\\ infos +wao.ui.form.otherBoatInfos=Other boat infos wao.ui.form.period=Period wao.ui.form.period.from=from wao.ui.form.period.to=to @@ -126,16 +127,16 @@ wao.ui.form.removeRole=remove this role wao.ui.form.repeatPassword=Repeat password wao.ui.form.roles=Roles -wao.ui.form.sortByTideBegin=Sort by observation\\ begin date -wao.ui.import.activityCalendarImportLabel=of the activity\\ calendar -wao.ui.import.activityCalendarImportRunning=Activity calendar import is running. You can keep browsing\\ while waiting\\ for\\ the upload end -wao.ui.import.activityCalendarLabel=of the activity\\ calendars -wao.ui.import.activityCalendarUserAccessesLabel=of user accesses\\ to\\ the activity calendars +wao.ui.form.sortByTideBegin=Sort by observation begin date +wao.ui.import.activityCalendarImportLabel=of the activity calendar +wao.ui.import.activityCalendarImportRunning=Activity calendar import is running. You can keep browsing while waiting for the upload end +wao.ui.import.activityCalendarLabel=of the activity calendars +wao.ui.import.activityCalendarUserAccessesLabel=of user accesses to the activity calendars wao.ui.import.boatDistrictLabel=of the coordinates of boat districts wao.ui.import.boatsLabel=of boats wao.ui.import.description=File %s %s \: wao.ui.import.fishingZoneLabel=of fishing zones -wao.ui.import.fullDescription=Import %s\\ (%s format with UTF-8 characters set) +wao.ui.import.fullDescription=Import %s (%s format with UTF-8 characters set) wao.ui.import.longTitle=CSV Import/Export (UTF-8) wao.ui.import.samplingPlanLabel=of the sampling plan wao.ui.import.title=%s import @@ -144,13 +145,13 @@ wao.ui.indicator.coefficient=Coefficient wao.ui.indicator.editions=Editions wao.ui.indicator.indicator=Indicator -wao.ui.indicator.legend=In yellow, the\\ current\\ position\\ of the company on this indicator +wao.ui.indicator.legend=In yellow, the current position of the company on this indicator wao.ui.indicator.levels=Levels -wao.ui.indicator.useRightDecimalSymbol=User '.' to for non-round values\\ +wao.ui.indicator.useRightDecimalSymbol=User '.' to for non-round values wao.ui.indicators.coefficientsSum=Coefficients sum -wao.ui.indicators.title=Providers quality\\ indicators -wao.ui.invalidLogin=Invalid\\ identifier -wao.ui.layout.userDescription=You are %s\\ of company\\ %s (%s) +wao.ui.indicators.title=Providers quality indicators +wao.ui.invalidLogin=Invalid identifier +wao.ui.layout.userDescription=You are %s of company %s (%s) wao.ui.message.chooseProfile=Choose your profile \: wao.ui.misc.N/A=non available wao.ui.misc.accepted=Accepted @@ -165,7 +166,7 @@ wao.ui.misc.creating=Creating... wao.ui.misc.import-export=Import/export wao.ui.misc.information=Information -wao.ui.misc.logFile.description=Show log\\ file for\\ %s +wao.ui.misc.logFile.description=Show log file for %s wao.ui.misc.no=no wao.ui.misc.noComment=no comment wao.ui.misc.notValidated=Not validated @@ -194,37 +195,37 @@ wao.ui.page.UserProfileForm.title=Profile management wao.ui.publishedByProgram=Pusblished by program wao.ui.publishedByYourCompany=Published by company -wao.ui.sampleRow.creation=Creation of\\ a sample row +wao.ui.sampleRow.creation=Creation of a sample row wao.ui.sampleRow.edition=Edtion of line %s -wao.ui.sampleRowLog.title=%s\\ line historic -wao.ui.samplingPlan.addSampleRow=Add a line in\\ the sampling plan -wao.ui.samplingPlan.export=Export\\\\ the sampling\\ plan from %s to %s -wao.ui.samplingPlan.showActual=Show realisez observations\\ effor\\\\for validated contacts only\\ -wao.ui.samplingPlan.showExpected=Show estimated observations effort for\\ contacts validated by company or not +wao.ui.sampleRowLog.title=%s line historic +wao.ui.samplingPlan.addSampleRow=Add a line in the sampling plan +wao.ui.samplingPlan.export=Export the sampling plan from %s to %s +wao.ui.samplingPlan.showActual=Show realisez observations efforfor validated contacts only +wao.ui.samplingPlan.showExpected=Show estimated observations effort for contacts validated by company or not wao.ui.samplingPlan.title=Sampling plan -wao.ui.synthesis.allegroReactivity.description=This result is an average\\ of the\\ number of days between the Allegro input date and\\ the\\ date of the observation end. -wao.ui.synthesis.allegroReactivity.title=Allegro\\ input reactivity in relation to\\ tide end date -wao.ui.synthesis.boarding.boardingCount=Total \: %s\\ invalid\\ boardings on %s boardings. -wao.ui.synthesis.boarding.description=In these results, only\\ sample rows\\ with average tide time below 48 hours are considered.\\ -wao.ui.synthesis.boarding.mostUsedBoat=Most used\\ boat with\\ %s boardings \:\\ %s (%s) -wao.ui.synthesis.boarding.title=Boats\\solicitations -wao.ui.synthesis.complianceBoarding.description=Respect of the\\ defined\\ number of observants pour each\\ tides. -wao.ui.synthesis.complianceBoarding.title=Respect of the number of\\ observers -wao.ui.synthesis.contactsStates.description=Theses results consider\\ all\\ contacts states except\\ those\\ that are\\ refused by\\ the program. +wao.ui.synthesis.allegroReactivity.description=This result is an average of the number of days between the Allegro input date and the date of the observation end. +wao.ui.synthesis.allegroReactivity.title=Allegro input reactivity in relation to tide end date +wao.ui.synthesis.boarding.boardingCount=Total \: %s invalid boardings on %s boardings. +wao.ui.synthesis.boarding.description=In these results, only sample rows with average tide time below 48 hours are considered. +wao.ui.synthesis.boarding.mostUsedBoat=Most used boat with %s boardings \: %s (%s) +wao.ui.synthesis.boarding.title=Boatssolicitations +wao.ui.synthesis.complianceBoarding.description=Respect of the defined number of observants pour each tides. +wao.ui.synthesis.complianceBoarding.title=Respect of the number of observers +wao.ui.synthesis.contactsStates.description=Theses results consider all contacts states except those that are refused by the program. wao.ui.synthesis.contactsStates.title=Contact states -wao.ui.synthesis.dataReliability.description=Percentage of the number of tides\\ providing\\ reliable data\\ in relation to\\ the\\ total number of realized tides. +wao.ui.synthesis.dataReliability.description=Percentage of the number of tides providing reliable data in relation to the total number of realized tides. wao.ui.synthesis.dataReliability.title=Data reliability -wao.ui.synthesis.dataSampling.title=Tides\\ data (realized / expected) -wao.ui.synthesis.globalSynthesis.globalResult=Result\\of the\\ global synthesis +wao.ui.synthesis.dataSampling.title=Tides data (realized / expected) +wao.ui.synthesis.globalSynthesis.globalResult=Resultof the global synthesis wao.ui.synthesis.globalSynthesis.title=Global synthesis wao.ui.synthesis.globalSynthesis.title.estimated=Global synthesis (according to estimations) -wao.ui.synthesis.log.description=This page show every modifications done\\ since the\\ beginning\\ of the bounds of each levels and the coefficients\\ of each indicators. +wao.ui.synthesis.log.description=This page show every modifications done since the beginning of the bounds of each levels and the coefficients of each indicators. wao.ui.synthesis.log.empty=No modification until now wao.ui.synthesis.log.entry.author=Modification's author wao.ui.synthesis.log.entry.comment=Associated comment wao.ui.synthesis.log.entry.date=Modification date wao.ui.synthesis.log.entry.summary=Modifications done -wao.ui.synthesis.log.title=Global synthesis parameters\\ historic +wao.ui.synthesis.log.title=Global synthesis parameters historic wao.ui.unavailableOperation=Unavailable operation wao.ui.userList=Users list wao.ui.validLogin=Valid identifier Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-01-12 11:25:28 UTC (rev 916) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-01-13 08:55:58 UTC (rev 917) @@ -3,6 +3,7 @@ wao.ui.action.addNewContactFromBoat=Cr\u00E9er un nouveau contact pour ce navire et la ligne s\u00E9lectionn\u00E9e dans les filtres wao.ui.action.back=Revenier \u00E0 l'\u00E9cran pr\u00E9c\u00E9dent wao.ui.action.cancel=Annuler +wao.ui.action.changeLocale=Changer de langue wao.ui.action.contactAdmin=Contacter un responsable ObsMer wao.ui.action.create=Cr\u00E9er wao.ui.action.createCompany=Cr\u00E9er une soci\u00E9t\u00E9 Added: trunk/wao-ui/src/main/webapp/img/Flag_fr_gb.png =================================================================== (Binary files differ) Property changes on: trunk/wao-ui/src/main/webapp/img/Flag_fr_gb.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/wao-ui/src/main/webapp/img/source/Flag_fr_gb.svg =================================================================== --- trunk/wao-ui/src/main/webapp/img/source/Flag_fr_gb.svg (rev 0) +++ trunk/wao-ui/src/main/webapp/img/source/Flag_fr_gb.svg 2011-01-13 08:55:58 UTC (rev 917) @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + width="47.999996" + height="31.999998" + id="svg2" + inkscape:version="0.47 r22583" + sodipodi:docname="Flag_fr_gb.svg" + inkscape:export-filename="/home/bleny/projets/wao/wao-ui/src/main/webapp/img/Flag_fr_gb.png" + inkscape:export-xdpi="78.750008" + inkscape:export-ydpi="78.750008"> + <metadata + id="metadata14"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs12"> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 300 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="900 : 300 : 1" + inkscape:persp3d-origin="450 : 200 : 1" + id="perspective16" /> + <inkscape:perspective + id="perspective2924" + inkscape:persp3d-origin="600 : 200 : 1" + inkscape:vp_z="1200 : 300 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_x="0 : 300 : 1" + sodipodi:type="inkscape:persp3d" /> + </defs> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1280" + inkscape:window-height="729" + id="namedview10" + showgrid="false" + inkscape:zoom="4.6494017" + inkscape:cx="-18.276407" + inkscape:cy="6.3559302" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" /> + <g + id="g2927" + transform="matrix(0.83072596,0,0,1.0826785,-0.92177949,-0.2401779)"> + <path + id="path2908" + d="M 0,0 V 30 H 60 V 0 z" + style="fill:#00247d" /> + <path + id="path2910" + d="M 0,0 60,30 M 60,0 0,30" + style="stroke:#ffffff;stroke-width:6" /> + <path + id="path2912" + clip-path="url(#t)" + d="M 0,0 60,30 M 60,0 0,30" + style="stroke:#cf142b;stroke-width:4" /> + <path + id="path2914" + d="M 30,0 V 30 M 0,15 h 60" + style="stroke:#ffffff;stroke-width:10" /> + <path + id="path2916" + d="M 30,0 V 30 M 0,15 h 60" + style="stroke:#cf142b;stroke-width:6" /> + </g> + <path + style="fill:#ed2939" + d="M 48 0.09375 L 0 32 L 48 32 L 48 0.09375 z " + id="rect4" /> + <path + style="fill:#ffffff" + d="M 32 10.71875 L 0 32 L 32 32 L 32 10.71875 z " + id="rect6" /> + <path + style="fill:#002395" + d="M 16 21.375 L 0 32 L 16 32 L 16 21.375 z " + id="rect8" /> + <path + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 0,32 48.131108,0" + id="path2934" + sodipodi:nodetypes="cc" /> +</svg>