Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

9488 internationalization issues #9493

Merged
merged 6 commits into from
Jun 2, 2023

Conversation

JayanthyChengan
Copy link
Contributor

@JayanthyChengan JayanthyChengan commented Apr 4, 2023

@coveralls
Copy link

Coverage Status

Coverage: 20.184%. Remained the same when pulling 143ec9b on scholarsportal:9488_InternationlizationIssues into 97310b3 on IQSS:develop.

@pdurbin pdurbin added Feature: Internationalization Size: 3 A percentage of a sprint. 2.1 hours. labels Apr 4, 2023
@pdurbin
Copy link
Member

pdurbin commented Apr 4, 2023

@JayanthyChengan thanks for the pull request!

These seem like straightforward changes. Standard "move English into properties files" stuff.

I gave this PR a 3 in term of effort to review (which I've basically done) and QA.

Copy link
Member

@qqmyers qqmyers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. I see in the notes @pdurbin has reviewed as well. FOr @kcondon - the issue has details about where the fixes should be visible.

Copy link
Member

@qqmyers qqmyers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW: #9451 has a couple of the same fixes.

@pdurbin
Copy link
Member

pdurbin commented May 26, 2023

@JayanthyChengan hi! Can you please resolve the merge conflicts in this pull request? They're in this file:

diff --cc src/main/webapp/file-download-button-fragment.xhtml
index 322bd58906,cecc7ef8d0..0000000000
--- a/src/main/webapp/file-download-button-fragment.xhtml
+++ b/src/main/webapp/file-download-button-fragment.xhtml
@@@ -12,7 -12,7 +12,11 @@@
      xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
      
      <!-- Access Status -->
++<<<<<<< HEAD
 +    <li class="dropdown-header">#{bundle['dataset.accessBtn.header.fileaccess']} <span class="glyphicon glyphicon-file"/></li>
++=======
+     <li class="dropdown-header">#{bundle['file.accessBtn.header.access']} <span class="glyphicon glyphicon-file"/></li>
++>>>>>>> develop
      <li><span class="dropdown-item-text">
              <span class="#{!fileMetadata.restricted ?
                             'glyphicon glyphicon-globe text-success' : (!fileDownloadHelper.canDownloadFile(fileMetadata) ? 'glyphicon glyphicon-lock text-danger' : 'icon-unlock text-success')}"/>
@@@ -211,7 -211,7 +215,11 @@@
      <!-- END: CAN DOWNLOAD ACCESS Options -->
      
      <!-- Download Metadata -->
++<<<<<<< HEAD
 +    <li class="dropdown-header">#{bundle['dataset.accessBtn.header.downloadmetadata']} <span class="glyphicon glyphicon-download-alt"/></li>
++=======
+     <li class="dropdown-header">#{bundle['file.accessBtn.header.metadata']} <span class="glyphicon glyphicon-download-alt"/></li>
++>>>>>>> develop
      
      <ui:fragment rendered="#{fileMetadata.dataFile.tabularData and fileDownloadHelper.canDownloadFile(fileMetadata)}">
          <li>

@pdurbin
Copy link
Member

pdurbin commented May 26, 2023

Like @qqmyers said this PR is probably the cause:

We merged it a couple hours ago.

@pdurbin pdurbin changed the title 9488 internationlization issues 9488 internationalization issues May 26, 2023
@JayanthyChengan
Copy link
Contributor Author

@pdurbin - resolved the conflicts

@pdurbin
Copy link
Member

pdurbin commented May 31, 2023

@kcondon kcondon assigned kcondon and unassigned kcondon Jun 1, 2023
@kcondon
Copy link
Contributor

kcondon commented Jun 1, 2023

@JayanthyChengan When I clicked signup, I got a 500 error in the ui and this server.log error:
signup_svr_log_err.txt

@kcondon kcondon self-assigned this Jun 1, 2023
@JayanthyChengan
Copy link
Contributor Author

@kcondon - Committed the correction

@kcondon
Copy link
Contributor

kcondon commented Jun 2, 2023

@JayanthyChengan Thanks! I'm ready to merge it.

@kcondon kcondon merged commit 746c448 into IQSS:develop Jun 2, 2023
@pdurbin pdurbin added this to the 5.14 milestone Jun 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature: Internationalization Size: 3 A percentage of a sprint. 2.1 hours.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Internationalization issues where English text is appearing in UI and system-generated emails
5 participants