Improve on glossary upload ui, implement supported file format label

zanata · Sep 14, 2012 · 9f0ddf0 · 9f0ddf0
1 parent f1f0b58
commit 9f0ddf0
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/zanata-war/src/main/resources/messages.properties b/zanata-war/src/main/resources/messages.properties
@@ -149,8 +149,6 @@ jsf.Coordinator=Coordinator
 jsf.ContactAdmin=Contact Admin
 jsf.contactLanguageTeamCoordinator=Contact Team Coordinators
 jsf.contactLanguageTeamCoordinatorForLocale=Contact #{sendEmail.locale.localeId.id} (#{sendEmail.locale.retrieveNativeName()}) Language Team Coordinators
-jsf.CommentColumnNames=Comment column names
-jsf.CommentColumnNames.Title=Customized comment column headers for csv file format. Format of CSV: {source locale},{locale},{locale}...,pos,description OR {source locale},{locale},{locale}...,description1,description2... (Only apply for CSV file format)
 jsf.CountryCode=Country Code
 jsf.CreateANewProject=Create a New Project
 jsf.CreateNewGroup=Create New Group
@@ -254,8 +252,15 @@ jsf.ForgotYourPassword=Forgot your password?
 jsf.FoundResultsizeProjectsMatchingQuerySearchquery=Found #{projectSearch.resultSize} Projects matching query '#{projectSearch.searchQuery}'
 jsf.GenerateProjectConfig=Generate project configuration file (zanata.xml)
 jsf.Glossary=Glossary
-jsf.Glossary.TargetLanguage.Title=Target language (Only apply for PO file format)
+jsf.Glossary.SourceLocale.Title=Source locale (Only apply for PO file format)
+jsf.Glossary.TargetLocale.Title=Target locale (Only apply for PO file format)
+jsf.Glossary.supportedFileFormat=Supported file format: PO and CSV
 jsf.GlossaryStatistics=Glossary Statistics
+jsf.Glossary.CommentColumnNames=Comment column names
+jsf.Glossary.CommentColumnNames.Title=Customized comment column headers for csv file format. Format of CSV: {source locale},{locale},{locale}...,pos,description OR {source locale},{locale},{locale}...,description1,description2... (Only apply for CSV file format)
+jsf.Glossary.TreatSourceCommentsAsTarget=Treat source comments and ref as target comments
+jsf.Glossary.TreatSourceCommentsAsTarget.Title=When checked, source comments and references will be used as target comments
+
 jsf.GroupName=Group Name
 jsf.GroupId=Group ID
 jsf.GroupIdExample=Example: my-group
@@ -532,8 +537,6 @@ jsf.TotalDocuments=Total Documents
 jsf.TotalWords=Total Words
 jsf.Translate=Translate
 jsf.TranslateGWTDevMode=Translate (GWT DevMode)
-jsf.TreatSourceCommentsAsTarget=Treat source comments and ref as target comments
-jsf.TreatSourceCommentsAsTarget.Title=When checked, source comments and references will be used as target comments
 jsf.UnexpectedErrorPleaseTryAgain=Unexpected error. Please try again.
 jsf.Untranslated=Untranslated
 jsf.Upload=Upload

diff --git a/zanata-war/src/main/webapp/glossary/view.xhtml b/zanata-war/src/main/webapp/glossary/view.xhtml
@@ -126,13 +126,18 @@
 				<h:outputText value="#{messages['jsf.Upload']}" />
 			</f:facet>
 			<h:form id="uploadForm" enctype="multipart/form-data">
+				<div>
+					<h:outputLabel value="#{messages['jsf.Glossary.supportedFileFormat']}" class="glossarySupportedFileLabel" />
+				</div>
+
 				<s:fileUpload id="fileUpload" accept="*"
 					data="#{glossaryAction.glossaryFileUpload.fileContents}"
 					fileName="#{glossaryAction.glossaryFileUpload.fileName}"
 					onchange="updateForm(this.value)">
 				</s:fileUpload>
 
-				<div class="glosaryFileUploadDialog" id="sourceLangDiv" style="display:none">
+				<div title="#{messages['jsf.Glossary.SourceLocale.Title']}"
+					class="glosaryFileUploadDialog" id="sourceLangDiv" style="display:none">
 					<h:outputLabel value="Source Language" />
 					<h:selectOneMenu
 						value="#{glossaryAction.glossaryFileUpload.sourceLang}">
@@ -143,7 +148,7 @@
 
 					</h:selectOneMenu>
 				</div>
-				<div title="#{messages['jsf.Glossary.TargetLanguage.Title']}"
+				<div title="#{messages['jsf.Glossary.TargetLocale.Title']}"
 					class="glosaryFileUploadDialog" id="targetLangDiv" style="display:none">
 					<h:outputLabel value="Target Language" />
 					<h:selectOneMenu
@@ -158,19 +163,19 @@
 
 				<div class="glosaryFileUploadDialog" id="treatCommentSameDiv" style="display:none">
 					<h:outputText
-						value="#{messages['jsf.TreatSourceCommentsAsTarget']}?"
-						title="#{messages['jsf.TreatSourceCommentsAsTarget.Title']}" />
+						value="#{messages['jsf.Glossary.TreatSourceCommentsAsTarget']}?"
+						title="#{messages['jsf.Glossary.TreatSourceCommentsAsTarget.Title']}" />
 					<h:selectBooleanCheckbox
 						value="#{glossaryAction.glossaryFileUpload.treatSourceCommentsAsTarget}"
-						title="#{messages['jsf.TreatSourceCommentsAsTarget.Title']}" />
+						title="#{messages['jsf.Glossary.TreatSourceCommentsAsTarget.Title']}" />
 				</div>
 
 				<div class="glosaryFileUploadDialog" id="commentColsDiv" style="display:none">
-					<h:outputText value="#{messages['jsf.CommentColumnNames']}"
-						title="#{messages['jsf.CommentColumnNames.Title']}" />
+					<h:outputText value="#{messages['jsf.Glossary.CommentColumnNames']}"
+						title="#{messages['jsf.Glossary.CommentColumnNames.Title']}" />
 					<h:inputText
 						value="#{glossaryAction.glossaryFileUpload.commentCols}"
-						title="#{messages['jsf.CommentColumnNames.Title']}" />
+						title="#{messages['jsf.Glossary.CommentColumnNames.Title']}" />
 				</div>
 
 

diff --git a/zanata-war/src/main/webapp/stylesheet/zanata.css b/zanata-war/src/main/webapp/stylesheet/zanata.css
@@ -1090,6 +1090,13 @@ div.glosaryDeleteWarn span.warn
 	color:#D77D00;
 }
 
+.glossarySupportedFileLabel
+{
+	font-size:12px;
+	font-weight:bold;
+	color:#B62918;
+}
+
 /* ------------------------ End Glossary Page CSS --------------------------------------*/