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

Merge "Extract and show license key"

Browse source
This commit is contained in:
Brion Vibber 2013-10-09 21:09:13 +00:00 • committed by Gerrit Code Review
commit 9206e78e34
11 changed files with 440 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
commons/res/layout/detail_main_panel.xml
View file

@ -31,6 +31,14 @@
android:text="Description of the media goes here. This can potentially be fairly long, and will need to wrap across multiple lines. We hope it looks nice though."
android:id="@+id/mediaDetailDesc"
android:layout_gravity="left|start"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="License link"
android:id="@+id/mediaDetailLicense"
android:layout_gravity="left|start"
android:textColor="@android:color/white"
android:textSize="18sp" /> <!-- 18sp == MediumText -->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"

33
commons/res/values/strings.xml
View file

@ -93,9 +93,42 @@
<string name="menu_download">Download</string>
<string name="preference_license">License</string>
<!-- These three are semi-legacy entries, and should be changed in future -->
<string name="license_name_cc_by_sa">CC\u00A0Attribution-ShareAlike\u00A03.0</string>
<string name="license_name_cc_by">CC\u00A0Attribution\u00A03.0</string>
<string name="license_name_cc0">CC0</string>
<!-- Licenses from the default UploadWizard selection list -->
<string name="license_name_cc_by_sa_3_0">CC BY-SA 3.0</string>
<string name="license_name_cc_by_sa_3_0_at">CC BY-SA 3.0 (Austria)</string>
<string name="license_name_cc_by_sa_3_0_de">CC BY-SA 3.0 (Germany)</string>
<string name="license_name_cc_by_sa_3_0_ee">CC BY-SA 3.0 (Estonia)</string>
<string name="license_name_cc_by_sa_3_0_es">CC BY-SA 3.0 (Spain)</string>
<string name="license_name_cc_by_sa_3_0_hr">CC BY-SA 3.0 (Croatia)</string>
<string name="license_name_cc_by_sa_3_0_lu">CC BY-SA 3.0 (Luxembourg)</string>
<string name="license_name_cc_by_sa_3_0_nl">CC BY-SA 3.0 (Netherlands)</string>
<string name="license_name_cc_by_sa_3_0_no">CC BY-SA 3.0 (Norway)</string>
<string name="license_name_cc_by_sa_3_0_pl">CC BY-SA 3.0 (Poland)</string>
<string name="license_name_cc_by_sa_3_0_ro">CC BY-SA 3.0 (Romania)</string>
<string name="license_name_cc_by_3_0">CC BY 3.0</string>
<string name="license_name_cc_zero">CC Zero</string>
<string name="license_name_own_pd">own-pd</string>
<string name="license_name_cc_by_sa_2_5">CC BY-SA 2.5</string>
<string name="license_name_cc_by_2_5">CC BY 2.5</string>
<string name="license_name_cc_by_sa_2_0">CC BY-SA 2.0</string>
<string name="license_name_cc_by_2_0">CC BY-SA 2.0</string>
<string name="license_name_cc_2_0">CC BY 2.0</string>
<string name="license_name_fal">Free Art License</string>
<string name="license_name_pd_old_100">Public domain (author died over 100 years ago)</string>
<string name="license_name_pd_old">Public domain (copyright expired)</string>
<string name="license_name_pd_art">Public domain (art)</string>
<string name="license_name_pd_us">Public domain (US)</string>
<string name="license_name_pd_usgov">Public domain (US government)</string>
<string name="license_name_pd_usgov_nasa">Public domain (NASA)</string>
<string name="license_name_pd_ineligible">Public domain (ineligible for copyright)</string>
<string name="license_name_attribution">Attribution</string>
<string name="license_name_gfdl">GNU Free Documentation License</string>
<string name="welcome_wikipedia_text">Contribute your images. Help Wikipedia articles come to life!</string>
<string name="welcome_wikipedia_subtext">Images on Wikipedia come from Wikimedia Commons.</string>
<string name="welcome_copyright_text">Your images help educate people around the world.</string>

31
commons/res/xml/wikimedia_licenses.xml Normal file
View file

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<licenses xmlns="https://www.mediawiki.org/wiki/Extension:UploadWizard/xmlns/licenses">
<license id="cc-by-sa-3.0" template="cc-by-sa-3.0" url="https://creativecommons.org/licenses/by-sa/3.0/deed.$lang"/>
<license id="cc-by-sa-3.0-at" template="cc-by-sa-3.0-at" url="https://creativecommons.org/licenses/by-sa/3.0/at/deed.$lang"/>
<license id="cc-by-sa-3.0-de" template="cc-by-sa-3.0-de" url="https://creativecommons.org/licenses/by-sa/3.0/de/deed.$lang"/>
<license id="cc-by-sa-3.0-ee" template="cc-by-sa-3.0-ee" url="https://creativecommons.org/licenses/by-sa/3.0/ee/deed.$lang"/>
<license id="cc-by-sa-3.0-es" template="cc-by-sa-3.0-es" url="https://creativecommons.org/licenses/by-sa/3.0/es/deed.$lang"/>
<license id="cc-by-sa-3.0-hr" template="cc-by-sa-3.0-hr" url="https://creativecommons.org/licenses/by-sa/3.0/hr/deed.$lang"/>
<license id="cc-by-sa-3.0-lu" template="cc-by-sa-3.0-lu" url="https://creativecommons.org/licenses/by-sa/3.0/lu/deed.$lang"/>
<license id="cc-by-sa-3.0-nl" template="cc-by-sa-3.0-nl" url="https://creativecommons.org/licenses/by-sa/3.0/nl/deed.$lang"/>
<license id="cc-by-sa-3.0-no" template="cc-by-sa-3.0-no" url="https://creativecommons.org/licenses/by-sa/3.0/no/deed.$lang"/>
<license id="cc-by-sa-3.0-pl" template="cc-by-sa-3.0-pl" url="https://creativecommons.org/licenses/by-sa/3.0/pl/deed.$lang"/>
<license id="cc-by-sa-3.0-ro" template="cc-by-sa-3.0-ro" url="https://creativecommons.org/licenses/by-sa/3.0/ro/deed.$lang"/>
<license id="cc-by-3.0" template="cc-by-3.0" url="https://creativecommons.org/licenses/by/3.0/deed.$lang"/>
<license id="cc-zero" template="cc-zero" url="https://creativecommons.org/publicdomain/zero/1.0/deed.$lang"/>
<license id="own-pd" template="cc-zero"/>
<license id="cc-by-sa-2.5" template="cc-by-sa-2.5" url="https://creativecommons.org/licenses/by-sa/2.5/deed.$lang"/>
<license id="cc-by-2.5" template="cc-by-2.5" url="https://creativecommons.org/licenses/by/2.5/deed.$lang"/>
<license id="cc-by-sa-2.0" template="cc-by-sa-2.0" url="https://creativecommons.org/licenses/by-sa/2.0/deed.$lang"/>
<license id="cc-by-2.0" template="cc-by-2.0" url="https://creativecommons.org/licenses/by/2.0/deed.$lang"/>
<license id="fal" template="FAL"/>
<license id="pd-old-100" template="PD-old-100"/>
<license id="pd-old" template="PD-old"/>
<license id="pd-art" template="PD-Art"/>
<license id="pd-us" template="PD-US"/>
<license id="pd-usgov" template="PD-USGov"/>
<license id="pd-usgov-nasa" template="PD-USGov-NASA"/>
<license id="pd-ineligible" template="pd-ineligible"/>
<license id="attribution" template="attribution"/>
<license id="gfdl" template="GFDL"/>
</licenses>