Updated Translations for "Never Opened" and "Last Opened" #696

FareesHussain · 2020-11-12T01:21:28Z

Related issue : #548
Related PR : #681

Explanation

In this pr, I've added the missing string resources and resolved string resource errors

Checklist

resolved string resource id ("language_te") error in string.xml-te
resolved string resource id ("message_duplicate_file_upload_body error
added string resource for "Never Opened" (in all languages)
added string resource for "Last Opened" (in all languages)

message_duplicate_file_upload_body language_te

gradle/wrapper/gradle-wrapper.properties

Prakhar-Agarwal-byte · 2020-12-22T06:42:49Z

@FareesHussain Your branch has conflicts with amahi:beta branch. You must update your branch with new commits from beta, resolve the conflicts, and then send a PR with the updated branch.

� Conflicts: � src/main/res/values-bn/strings.xml � src/main/res/values-es/strings.xml � src/main/res/values-te/strings.xml � src/main/res/values/strings.xml

FareesHussain · 2020-12-22T19:40:57Z

Thanks @Prakhar-Agarwal-byte, updated

Prakhar-Agarwal-byte

@FareesHussain can you please add translations of the 2 new strings in German and Hindi as well so that your PR will be complete.

FareesHussain · 2020-12-23T06:17:41Z

@Prakhar-Agarwal-byte Thanks, I've updated it

Prakhar-Agarwal-byte

@cpg I think this PR is working fine now.

src/main/java/org/amahi/anywhere/fragment/AlertDialogFragment.java

chirag-jn

I reformatted the changed files so that they match the coding conventions. Rest looks good.

FareesHussain · 2020-12-31T10:03:58Z

I reformatted the changed files so that they match the coding conventions. Rest looks good.

Thanks a lot

FareesHussain · 2021-01-11T11:35:50Z

@cpg Please have a look

cpg · 2021-02-27T17:24:32Z

Oh no. Prior PR merges caused two conflicts. They look easy to merge, however I am not sure I will do it properly. Can you do it?

� Conflicts: � src/main/res/values-te/strings.xml � src/main/res/values/strings.xml

FareesHussain · 2021-02-27T17:38:42Z

Oh no. Prior PR merges caused two conflicts. They look easy to merge, however I am not sure I will do it properly. Can you do it?

@cpg Done, Please have a look.

chirag-jn · 2021-02-27T19:03:27Z

Please see the compilation issue @FareesHussain. In my opinion, it must have failed locally too.

chirag-jn · 2021-02-27T19:04:21Z

src/main/res/values-te/strings.xml

+    <string name="language_fr">ఫ్రెంచ్</string>
+    <string name="language_es">స్పానిష్</string>
+    <string name="language_bn">బెంగాలీ</string>
+    <string name="language_de">జర్మన్</string>
   <string name="header_settings">సెట్టింగులు</string>


header_settings is present twice.

Fixed the issue. Let's see CI.

Thanks I've fixed the other conflicts too.

The CI still fails. Try building the app locally.

Yes, I've tried it There is some issue with punjabi language. I'm unable to figure it out.

As my changes were initially minor shall I create a new PR for this

# Conflicts: # src/main/res/values-te/strings.xml

� Conflicts: � src/main/res/values-bn/strings.xml � src/main/res/values-es/strings.xml � src/main/res/values-fr/strings.xml � src/main/res/values-te/strings.xml

github-actions · 2021-02-27T23:05:31Z

This pull request has conflicting changes, the author must resolve the conflicts before this pull request can be merged.

chirag-jn · 2021-03-01T20:11:32Z

src/main/res/values/strings.xml

+    <string name="never_opened">Never Opened</string>
+    <string name="last_opened">Last Opened</string>


Please add never_opened and last_opened for values-zh (Chinese) too. Rest seems fine.

Sorry for the delay. I'll do it now

Done please check

github-actions · 2021-03-04T00:51:34Z

This pull request has conflicting changes, the author must resolve the conflicts before this pull request can be merged.

cpg · 2021-03-05T19:35:22Z

Did you guys get a chance to test this PR?
If so, how's it looking?

github-actions · 2021-03-14T17:17:45Z

This pull request has conflicting changes, the author must resolve the conflicts before this pull request can be merged.

FareesHussain added 2 commits November 12, 2020 06:43

Added String Resources for "Never Opened" & "Last Opened"

7c941bc

Fixed string resource errors in strings.xml-te

4c8ccbb

message_duplicate_file_upload_body language_te

FareesHussain mentioned this pull request Nov 12, 2020

Localization Support #548

Open

cpg reviewed Dec 4, 2020

View reviewed changes

gradle/wrapper/gradle-wrapper.properties Outdated Show resolved Hide resolved

Update gradle-wrapper.properties

5f91d1a

FareesHussain requested a review from cpg December 5, 2020 05:47

Merge branch 'beta' of https://github.com/amahi/android into beta

c06e0b5

� Conflicts: � src/main/res/values-bn/strings.xml � src/main/res/values-es/strings.xml � src/main/res/values-te/strings.xml � src/main/res/values/strings.xml

Prakhar-Agarwal-byte reviewed Dec 23, 2020

View reviewed changes

Resolving requested changes

45a757f

Prakhar-Agarwal-byte approved these changes Dec 23, 2020 •

edited

Loading

View reviewed changes

Prakhar-Agarwal-byte approved these changes Dec 23, 2020

View reviewed changes

chirag-jn approved these changes Dec 28, 2020

View reviewed changes

chirag-jn requested changes Dec 28, 2020

View reviewed changes

src/main/java/org/amahi/anywhere/fragment/AlertDialogFragment.java Outdated Show resolved Hide resolved

chirag-jn added the enhancement label Dec 28, 2020

Resolving requested changes

4f2b9db

FareesHussain requested a review from chirag-jn December 29, 2020 09:10

Prakhar-Agarwal-byte approved these changes Dec 31, 2020

View reviewed changes

chirag-jn added 2 commits December 31, 2020 15:29

Lint strings file

1076682

lint AlertDialogFragment

520f237

chirag-jn approved these changes Dec 31, 2020

View reviewed changes

Merge branch 'beta' of https://github.com/amahi/android into beta

e331b4e

� Conflicts: � src/main/res/values-te/strings.xml � src/main/res/values/strings.xml

chirag-jn requested changes Feb 27, 2021

View reviewed changes

chirag-jn and others added 8 commits February 28, 2021 00:35

Update strings.xml

565648b

Fix errors

86d5dfe

Merge remote-tracking branch 'origin/beta' into beta

3634f07

# Conflicts: # src/main/res/values-te/strings.xml

Merge branch 'beta' of https://github.com/amahi/android into beta

d28e196

� Conflicts: � src/main/res/values-bn/strings.xml � src/main/res/values-es/strings.xml � src/main/res/values-fr/strings.xml � src/main/res/values-te/strings.xml

Updates values-te/strings.xml

f95e564

Update values/strings.xml

71b5e6e

Add chinese to values/strings.xml

975ba85

Add back press toast message

fe8d44a

github-actions bot added the conflicting label Feb 27, 2021

Merge branch 'beta' into beta

7063bf8

chirag-jn removed the conflicting label Feb 28, 2021

FareesHussain requested a review from chirag-jn March 1, 2021 19:51

chirag-jn requested changes Mar 1, 2021

View reviewed changes

chirag-jn changed the title ~~Updated Translations~~ Updated Translations for "Never Opened" and "Last Opened" Mar 1, 2021

cpg assigned FareesHussain Mar 4, 2021

github-actions bot added the conflicting label Mar 4, 2021

Merge branch 'beta' into beta

ef929b4

chirag-jn removed the conflicting label Mar 5, 2021

FareesHussain added 2 commits March 6, 2021 03:57

Added last opened and never opend for chinese, panjabi and telugu

dd2737d

Merge remote-tracking branch 'origin/beta' into beta

a84b3ff

FareesHussain requested a review from chirag-jn March 5, 2021 22:29

removed duplicate strings

ceda97a

github-actions bot added the conflicting label Mar 14, 2021

FareesHussain closed this Mar 31, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updated Translations for "Never Opened" and "Last Opened" #696

Updated Translations for "Never Opened" and "Last Opened" #696

FareesHussain commented Nov 12, 2020 •

edited

Loading

Prakhar-Agarwal-byte commented Dec 22, 2020

FareesHussain commented Dec 22, 2020

Prakhar-Agarwal-byte left a comment

FareesHussain commented Dec 23, 2020

Prakhar-Agarwal-byte left a comment

chirag-jn left a comment •

edited

Loading

FareesHussain commented Dec 31, 2020

FareesHussain commented Jan 11, 2021

cpg commented Feb 27, 2021

FareesHussain commented Feb 27, 2021 •

edited

Loading

chirag-jn commented Feb 27, 2021

chirag-jn Feb 27, 2021

chirag-jn Feb 27, 2021

FareesHussain Feb 27, 2021

chirag-jn Feb 27, 2021

FareesHussain Feb 27, 2021

FareesHussain Feb 27, 2021

github-actions bot commented Feb 27, 2021

chirag-jn Mar 1, 2021

FareesHussain Mar 5, 2021

FareesHussain Mar 5, 2021

github-actions bot commented Mar 4, 2021

cpg commented Mar 5, 2021

github-actions bot commented Mar 14, 2021

		<string name="never_opened">Never Opened</string>
		<string name="last_opened">Last Opened</string>

Updated Translations for "Never Opened" and "Last Opened" #696

Updated Translations for "Never Opened" and "Last Opened" #696

Conversation

FareesHussain commented Nov 12, 2020 • edited Loading

Explanation

Checklist

Prakhar-Agarwal-byte commented Dec 22, 2020

FareesHussain commented Dec 22, 2020

Prakhar-Agarwal-byte left a comment

Choose a reason for hiding this comment

FareesHussain commented Dec 23, 2020

Prakhar-Agarwal-byte left a comment

Choose a reason for hiding this comment

chirag-jn left a comment • edited Loading

Choose a reason for hiding this comment

FareesHussain commented Dec 31, 2020

FareesHussain commented Jan 11, 2021

cpg commented Feb 27, 2021

FareesHussain commented Feb 27, 2021 • edited Loading

chirag-jn commented Feb 27, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Feb 27, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Mar 4, 2021

cpg commented Mar 5, 2021

github-actions bot commented Mar 14, 2021

FareesHussain commented Nov 12, 2020 •

edited

Loading

chirag-jn left a comment •

edited

Loading

FareesHussain commented Feb 27, 2021 •

edited

Loading