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.

Sign up for GitHub

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

Neutral config #654

Merged
merged 2 commits into from
Aug 1, 2024
Merged

Neutral config #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81bc5ee
removal of species specific language
TanyaStere42 Aug 1, 2024
ec6ef5c
bug correction from timeout warning
TanyaStere42 Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions devops/deploy/.dockerfiles/tomcat/commonConfiguration.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,8 +397,6 @@ it = italiano
#silo security
collaborationSecurityEnabled = true


## Added for ASWN expansion of flukebook
behavior0 = breaching
behavior1 = feeding

Expand Down Expand Up @@ -480,3 +478,7 @@ defaultReceiveEmails=true

#### Community URL ####
wildbookCommunityUrl=https://community.wildme.org

### for page timeout
sessionCountdownTime = 10
sessionWarningTime = 20
6 changes: 4 additions & 2 deletions devops/development/.dockerfiles/tomcat/commonConfiguration.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,8 +397,6 @@ it = italiano
#silo security
collaborationSecurityEnabled = true


## Added for ASWN expansion of flukebook
behavior0 = breaching
behavior1 = feeding

Expand Down Expand Up @@ -480,3 +478,7 @@ defaultReceiveEmails=true

#### Community URL ####
wildbookCommunityUrl=https://community.wildme.org

### for page timeout
sessionCountdownTime = 10
sessionWarningTime = 20
6 changes: 4 additions & 2 deletions src/main/resources/bundles/commonConfiguration.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,8 +373,6 @@ it = italiano
#silo security
collaborationSecurityEnabled = true


## Added for ASWN expansion of flukebook
behavior0 = breaching
behavior1 = feeding

Expand Down Expand Up @@ -460,3 +458,7 @@ sessionCountdownTime = 10

#### Community URL ####
wildbookCommunityUrl=https://community.wildme.org

### for page timeout
sessionCountdownTime = 10
sessionWarningTime = 20
28 changes: 14 additions & 14 deletions src/main/resources/bundles/en/index.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

reportEncounter = Report Encounter
mainSplash = Flukebook helps you study, identify, and protect cetaceans worldwide
mainSplash = Wildbook helps you study, identify, and protect cetaceans worldwide
howItWorksH = Machine Learning & Citizen Science & Conservation Research
howItWorksHDescription = Flukebook applies computer vision algorithms and deep learning to identify and track individual whales and dolphins across hundreds of thousands of photos. We help researchers collaborate with each other and citizen scientists contribute to the effort. A.I. scales and speeds research and conservation.
howItWorksHDescription = Wildbook applies computer vision algorithms and deep learning to identify and track individual animals across hundreds of thousands of photos. We help researchers collaborate with each other and citizen scientists contribute to the effort. A.I. scales and speeds research and conservation.
howItWorks1 = Step 1. Deep Learning Finds Animals
howItWorks1Description = We train computer vision to find individual whales and dolphins in photos and identify the species.
howItWorks1Description = We train computer vision to find individual animals in photos and identify the species.
howItWorks2 = Step 2. Algorithms and Neural Networks Identify Individuals
howItWorks2Description = When we know where each animal is, we can identify them individually using algorithms that make digital "fingerprints" for each animal, such as identifying them by their unique body coloration or fin edges. We replace hours of human labor with just a few minutes of computer vision, scanning for matches across tens of thousands of photos.
howItWorks2Description = When we know where each animal is, we can identify them individually using algorithms that make digital "fingerprints" for each animal, looking for unique patterns. We replace hours of human labor with just a few minutes of computer vision, scanning for matches across tens of thousands of photos.
howItWorks3 = One Platform, Many Species, Many Researchers
howItWorks3Description = We can identify individuals of these species using fully automated computer vision:
howItWorks4 = Step 3. Population Dynamics Define Conservation Action
Expand All @@ -22,10 +22,10 @@ carouselMatching = \u0020Matching process
carouselResult = \u0020Match result

innerPhotoH3 = Photograph the ID area
innerPhotoP = Animals with patterned features can often be identified uniquely, such as by the distinctive shape of their fin or fluke coloration. By taking a picture, you can match that pattern to others already in the database. Your animal might be new to the database, or it might be a new sighting of one we have seen before!
innerPhotoP = Animals with patterned features can often be identified uniquely, such as by the distinctive coloration. By taking a picture, you can match that pattern to others already in the database. Your animal might be new to the database, or it might be a new sighting of one we have seen before!

innerSubmitH3 = Submit PhotoID or sighting
innerSubmitP = You can upload files from your computer, or take them directly from your Flickr or Facebook account. Be sure to enter when and where you saw the animal, and add other information, such as species or sex, if you can. You will receive email updates when your animal is processed.
innerSubmitP = You can upload files from your computer. Be sure to enter when and where you saw the animal, and add other information, such as species or sex, if you can. You will receive email updates when your animal is processed.

innerVerifyH3 = Researcher verification
innerVerifyP = When you submit an identification photo, a local researcher receives a notification. This researcher will double check that the information you submitted is correct (so don't worry if you are unsure about which species you saw!).
Expand Down Expand Up @@ -58,20 +58,20 @@ worldEncs = Encounters around the world
# This is a text dense area, and formatting this way reduces the amount of
# variables in props significantly.

adoptionHeader = <h2 class="section-header">How can I help?</h2><p class="lead text-center">If you are not on site, there are still other ways to get engaged</p>
# adoptionHeader = <h2 class="section-header">How can I help?</h2><p class="lead text-center">If you are not on site, there are still other ways to get engaged</p>

adoptionBody = <div class=" col-xs-12 col-sm-6 col-md-6 col-lg-6"> <h3 class="uppercase">Adopt an animal</h3> <ul> <li>Support individual research programs in different regions</li> <li>Receive email updates when we resight your adopted animal</li> <li>Display your photo and a quote on the animal's page in our database</li> </ul> <a href="adoptananimal.jsp" title="">Learn more about adopting an individual animal in our study</a> </div>
# adoptionBody = <div class=" col-xs-12 col-sm-6 col-md-6 col-lg-6"> <h3 class="uppercase">Adopt an animal</h3> <ul> <li>Support individual research programs in different regions</li> <li>Receive email updates when we resight your adopted animal</li> <li>Display your photo and a quote on the animal's page in our database</li> </ul> <a href="adoptananimal.jsp" title="">Learn more about adopting an individual animal in our study</a> </div>

donationText = <section class="donate-section"><div class="col-xs-12 col-sm-6 col-md-6 col-lg-6"><h3>Donate</h3><p>Donations, including in-kind, large or small, are always welcome. Your support helps the continued development of our project and can support effective, science-based conservation management, and safeguard these animals and their habitat.</p><a href="adoptananimal.jsp" title="More information about donations">Learn more about how to donate</a></div><div class="col-xs-12 col-sm-5 col-md-5 col-lg-5 col-sm-offset-1 col-md-offset-1 col-lg-offset-1"><a href="oneTimeDonation.jsp"><button class="large">One Time Donation<span class="button-icon" aria-hidden="true"></button></a></div></section>

4cetaceanResearch = A.I. for Cetacean Research
# 4cetaceanResearch = A.I. for Cetacean Research
latestAnimalEncounters = Latest animal encounters
identifiedAnimals = identified whales and dolphins
identifiedAnimals = identified animals
reportedSightings = reported sightings
citizenScientists = citizen scientists
researchVolunteers = researchers and volunteers
showContributors = Show me all the contributors
megapteraMatching = Megaptera novaengliae (humpback whales) can be identified by the contrasting color and the trailing edge of their flukes using three algorithms: HotSpotter, CurvRank, and OC/WDTW
physeterMatching = Physeter macrocephalus (sperm whales) can be identified by the trailing edge of their flukes using two algorithms: CurvRank and OC/WDTW
tursiopsMatching = Tursiops truncatus(bottlenose dolphins) can be identified by the trailing edge of their fins with the CurvRank algorithm.
eubalaenaMatching = Eubalaena spp.(right whales) can be identified by the contrasting color on their heads by the HotSpotter and DeepSense.ai algorithms.
# megapteraMatching = Megaptera novaengliae (humpback whales) can be identified by the contrasting color and the trailing edge of their flukes using three algorithms: HotSpotter, CurvRank, and OC/WDTW
# physeterMatching = Physeter macrocephalus (sperm whales) can be identified by the trailing edge of their flukes using two algorithms: CurvRank and OC/WDTW
# tursiopsMatching = Tursiops truncatus(bottlenose dolphins) can be identified by the trailing edge of their fins with the CurvRank algorithm.
# eubalaenaMatching = Eubalaena spp.(right whales) can be identified by the contrasting color on their heads by the HotSpotter and DeepSense.ai algorithms.
56 changes: 33 additions & 23 deletions src/main/webapp/citing.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,52 @@
<jsp:include page="header.jsp" flush="true"/>
<jsp:include page="header.jsp" flush="true" />

<div class="container maincontent">




<h1>How to Cite Flukebook and Collaborative Data</h1>

<p>Even if a collaborative link has been made between users, Flukebook requests you to contact the data provider(s) for use of any and all data shared in a collaboration if it is to be used in any publication, product, or commercial application.</p>

<p>By using Flukebook the user agrees to the following:
<h1>How to Cite Wildbook and Collaborative Data</h1>

<p>Even if a collaborative link has been made between users, Wildbook requests you to contact the data provider(s)
for use of any and all data shared in a collaboration if it is to be used in any publication, product, or
commercial application.</p>

<p>By using any Wildbook the user agrees to the following:
<ol>
<li>Not to use data contained in Flukebook in any publication, product, or commercial application without prior written consent of the original data provider.</li>
<li>To cite both the data provider(s) and Flukebook appropriately after approval of use is obtained.
<li>Not to use data contained in Wildbook in any publication, product, or commercial application without prior
written consent of the original data provider.</li>
<li>To cite both the data provider(s) and Wildbook appropriately after approval of use is obtained.
<ul>
<li>Collaborative datasets should list all data contributors in descending order of quantity of encounters contributed. The year should be listed as the year when the dataset was pooled and downloaded.</li>
<li>Example citation for a dataset:
<li>Collaborative datasets should list all data contributors in descending order of quantity of
encounters contributed. The year should be listed as the year when the dataset was pooled and
downloaded.</li>
<li><b>Example citation for a dataset:</b>
<ul>
<li>S.Gero, J. Levenson, J. Van Oast., J Holmberg, A. Marine-Biologist, C. Researcher, O. Cean. (2016). Collaborative dataset from: Flukebook.org. Consolidated and downloaded: June 15, 2016.</li>

<li>S.Gero, J. Levenson, J. Van Oast., J Holmberg, A. Marine-Biologist, C. Researcher, O. Cean.
(2016). Collaborative dataset from: Flukebook.org. Consolidated and downloaded: June 15,
2016.</li>

</ul>

</li>
<li>General citation for Flukebook:
<li><b>Example citation for a Wildbook:</b>
<ul>
<li>J. Levenson, S. Gero, J. Van Oast, and J. Holmberg. 2015. Flukebook: a cloud-based photo-identification analysis tools for marine mammal research. Accessible at: https://www.flukebook.org </li>

<li>J. Levenson, S. Gero, J. Van Oast, and J. Holmberg. 2015. Flukebook: a cloud-based
photo-identification analysis tools for marine mammal research. Accessible at:
https://www.flukebook.org </li>

</ul>

</li>
</ul>
</li>
<li>To forward the citation of any publication / report that made use of the data / tools provided by Flukebook for inclusion in our list of references. Submit here: info@flukebook.org</li>
<li>Not to hold Flukebook or the original data providers liable for errors in the data. While we have made every effort to ensure the quality of the database, we cannot guarantee the accuracy of these datasets.</li>
<li>To forward the citation of any publication / report that made use of the data / tools provided by Wild Me
for inclusion in our list of references by submitting to info@wildme.org</li>
<li>Not to hold Wild Me or the original data providers liable for errors in the data. While we have made every
effort to ensure the quality of the database, we cannot guarantee the accuracy of these datasets.</li>
</ol>
</p>

</div>
</p>

<jsp:include page="footer.jsp" flush="true"/>
</div>

<jsp:include page="footer.jsp" flush="true" />
Loading
Loading