mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Changed line break behaviour. (#5562)

Browse source 
Added line breaks to PageContentsCreator.java, CategoryEditHelperUnitTests.kt, and MediaDetailFragmentUnitTests.kt following the example given on issue #5523.
This commit is contained in:
Ivan C. Acha 2024-02-25 09:00:45 -05:00 • committed by GitHub
parent 0656c88fbe
commit 535792390e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/fr/free/nrw/commons/upload/PageContentsCreator.java
View file

@ -44,7 +44,6 @@ public class PageContentsCreator {
.append("}}"); .append("}}");
} }
buffer buffer
.append("\n")
.append("|source=").append("{{own}}\n") .append("|source=").append("{{own}}\n")
.append("|author=[[User:").append(media.getAuthor()).append("|") .append("|author=[[User:").append(media.getAuthor()).append("|")
.append(media.getAuthor()).append("]]\n"); .append(media.getAuthor()).append("]]\n");
@ -68,7 +67,9 @@ public class PageContentsCreator {
Utils.getWikiLovesMonumentsYear(Calendar.getInstance()), contribution.getCountryCode())); Utils.getWikiLovesMonumentsYear(Calendar.getInstance()), contribution.getCountryCode()));
} }
buffer.append("== {{int:license-header}} ==\n") buffer
.append("\n")
.append("== {{int:license-header}} ==\n")
.append(licenseTemplateFor(media.getLicense())).append("\n\n") .append(licenseTemplateFor(media.getLicense())).append("\n\n")
.append("{{Uploaded from Mobile|platform=Android|version=") .append("{{Uploaded from Mobile|platform=Android|version=")
.append(ConfigUtils.getVersionNameWithSha(context)).append("}}\n"); .append(ConfigUtils.getVersionNameWithSha(context)).append("}}\n");

2
app/src/test/kotlin/fr/free/nrw/commons/category/CategoryEditHelperUnitTests.kt
View file

@ -87,12 +87,12 @@ class CategoryEditHelperUnitTests {
helper.makeCategoryEdit(context, media, listOf("Test"), "== {{int:filedesc}} ==\n" + helper.makeCategoryEdit(context, media, listOf("Test"), "== {{int:filedesc}} ==\n" +
"{{Information\n" + "{{Information\n" +
"|description=\n" + "|description=\n" +
"\n" +
"|source={{own}}\n" + "|source={{own}}\n" +
"|author=[[User:UserForthBeta|UserForthBeta]]\n" + "|author=[[User:UserForthBeta|UserForthBeta]]\n" +
"|date={{According to Exif data|2022-03-06}}\n" + "|date={{According to Exif data|2022-03-06}}\n" +
"}}\n" + "}}\n" +
"{{Location|22.538830555555556|114.08847222222222}}\n" + "{{Location|22.538830555555556|114.08847222222222}}\n" +
"\n" +
"== {{int:license-header}} ==\n" + "== {{int:license-header}} ==\n" +
"{{self|cc-zero}}\n" + "{{self|cc-zero}}\n" +
"\n" + "\n" +

6
app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailFragmentUnitTests.kt
View file

@ -383,7 +383,7 @@ class MediaDetailFragmentUnitTests {
"|other versions=\n" + "|other versions=\n" +
"}}\n" + "}}\n" +
"{{Location|27.043186|88.267003}}\n" + "{{Location|27.043186|88.267003}}\n" +
"{{Assessments|featured=1}}" "{{Assessments|featured=1}}\n"
val map = linkedMapOf("en" to "Antique cash register in a cafe, Darjeeling") val map = linkedMapOf("en" to "Antique cash register in a cafe, Darjeeling")
Assert.assertEquals(map, method.invoke(fragment, s)) Assert.assertEquals(map, method.invoke(fragment, s))
} }
@ -429,7 +429,7 @@ class MediaDetailFragmentUnitTests {
"|Other fields = {{Credit line |Author = © [[User:Colin]] | Other = Wikimedia Commons |License = CC-BY-SA-4.0}}\n" + "|Other fields = {{Credit line |Author = © [[User:Colin]] | Other = Wikimedia Commons |License = CC-BY-SA-4.0}}\n" +
"}}\n" + "}}\n" +
"{{Location|51.519003|-0.138353}}\n" + "{{Location|51.519003|-0.138353}}\n" +
"{{Assessments|featured=1}}" "{{Assessments|featured=1}}\n"
val map = linkedMapOf("en" to "[[:en:Fitzrovia Chapel|Fitzrovia Chapel]] ceiling<br/>\n") val map = linkedMapOf("en" to "[[:en:Fitzrovia Chapel|Fitzrovia Chapel]] ceiling<br/>\n")
Assert.assertEquals(map, method.invoke(fragment, s)) Assert.assertEquals(map, method.invoke(fragment, s))
} }
@ -487,7 +487,7 @@ class MediaDetailFragmentUnitTests {
"|Date =2015-02-17\n" + "|Date =2015-02-17\n" +
"|Permission ={{Diliff/Licensing}}\n" + "|Permission ={{Diliff/Licensing}}\n" +
"|other_versions=\n" + "|other_versions=\n" +
"}}" "}}\n"
val map = linkedMapOf("en" to "The interior of Sacred Heart RC Church, Wimbledon, London.") val map = linkedMapOf("en" to "The interior of Sacred Heart RC Church, Wimbledon, London.")
Assert.assertEquals(map, method.invoke(fragment, s)) Assert.assertEquals(map, method.invoke(fragment, s))
} }