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

Jump to bottom

Code for moving data files #578

Open
wants to merge 45 commits into
base: master
Choose a base branch
from
Open

Code for moving data files #578

Show file tree
Hide file tree
Changes from 39 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
202f771
code for moving files in app/
ashutoshnarayan Nov 7, 2018
500ee98
results of script
ashutoshnarayan Nov 8, 2018
f87e7cf
adding output of script again
ashutoshnarayan Nov 8, 2018
6549c49
Adding files and running script again
ashutoshnarayan Nov 8, 2018
01faff1
adding README to resources
ashutoshnarayan Nov 8, 2018
7f8d509
files added
ashutoshnarayan Nov 8, 2018
e73504f
adding module
ashutoshnarayan Nov 8, 2018
8b39b24
code edited to keep files in vendor dir
ashutoshnarayan Nov 8, 2018
55a20b4
files that were changed are added
ashutoshnarayan Nov 8, 2018
c287021
adding path to modules
ashutoshnarayan Nov 8, 2018
8d60758
added utils module
ashutoshnarayan Nov 8, 2018
fafa4e6
code modified to include import lines, dictionary path
ashutoshnarayan Nov 10, 2018
47a9341
added code to make changes in module
ashutoshnarayan Nov 10, 2018
296b69f
changed imported module
ashutoshnarayan Nov 10, 2018
1b0749d
files that got changed
ashutoshnarayan Nov 10, 2018
03071f4
changed path in model.py code
ashutoshnarayan Nov 10, 2018
abcbfdc
added model module
ashutoshnarayan Jan 20, 2019
61ac7dc
code for copying languages
ashutoshnarayan Mar 14, 2019
ad8c4cd
code to move languages file
ashutoshnarayan Mar 14, 2019
8e3d1d2
removed sys.path as dirs are no more existing
ashutoshnarayan Mar 14, 2019
68c83bb
removed name within code
ashutoshnarayan Mar 14, 2019
6624e28
removed inline name
ashutoshnarayan Mar 14, 2019
0ec94b7
removed inline name
ashutoshnarayan Mar 14, 2019
d63d9b2
removed inline name
ashutoshnarayan Mar 14, 2019
ef05dfb
removed inline name
ashutoshnarayan Mar 14, 2019
e456a73
removed inline name
ashutoshnarayan Mar 14, 2019
18300f1
removed inline name
ashutoshnarayan Mar 14, 2019
4c31bd6
removed inline name
ashutoshnarayan Mar 14, 2019
9a1035f
removed inline name
ashutoshnarayan Mar 14, 2019
fbcbe73
removed inline name
ashutoshnarayan Mar 14, 2019
c321880
removed inline name
ashutoshnarayan Mar 14, 2019
81da1e6
removed inline name
ashutoshnarayan Mar 14, 2019
ab9e0a7
removed inline name
ashutoshnarayan Mar 14, 2019
ce2c5db
removed inline name
ashutoshnarayan Mar 14, 2019
268cb6f
removed inline name
ashutoshnarayan Mar 14, 2019
f7cea4a
removed inline name
ashutoshnarayan Mar 14, 2019
c07c266
removed inline name
ashutoshnarayan Mar 14, 2019
0b008ba
removed inline name
ashutoshnarayan Mar 14, 2019
e83a925
removed inline name
ashutoshnarayan Mar 14, 2019
1880fff
removed import sys line for handlers and utils
ashutoshnarayan May 4, 2019
56c2aa7
removed import sys line for handlers and utils
ashutoshnarayan May 4, 2019
77d5bac
removed import sys line for handlers and utils
ashutoshnarayan May 4, 2019
7487220
removed from utils line
ashutoshnarayan May 4, 2019
b703238
uncommented utils
ashutoshnarayan May 4, 2019
2f10438
removed sys path
ashutoshnarayan May 4, 2019
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
2 changes: 1 addition & 1 deletion app/admin_resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import mimetypes

import config
import const
from utils import const
Copy link
Contributor

Choose a reason for hiding this comment

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

Did you intend to include all these changes related to const.py in this PR (the title says it's just for moving the data files)?

Copy link
Author

Choose a reason for hiding this comment

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

@nworden Initially in PR #450 ( closed ) I moved files related to handlers and utils into respective directories. This PR actually reverts them to app/ and copies only contents related to app/data/

Copy link
Contributor

Choose a reason for hiding this comment

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

The diffs I'm looking at are your current PR compared to our master branch, and there are a lot of changes unrelated to the data files. In particular, in many places it changes imports of const from import const to from utils import const (along with changes to sys.path and the django.po files).

Copy link
Author

Choose a reason for hiding this comment

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

Did you intend to include all these changes related to const.py in this PR (the title says it's just for moving the data files)?

@nworden It was actually the part of handlers which were supposed to be moved from app directory. Now since handlers are kept under app/ we can keep const.py here itself.

Copy link
Author

Choose a reason for hiding this comment

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

The diffs I'm looking at are your current PR compared to our master branch, and there are a lot of changes unrelated to the data files. In particular, in many places it changes imports of const from import const to from utils import const (along with changes to sys.path and the django.po files).

@nworden I have reverted that change to import const

from resources import Resource, ResourceBundle
import utils

Expand Down
2 changes: 1 addition & 1 deletion app/admin_review.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from google.appengine.ext import db
from google.appengine.api import users

import const
from utils import const
import model
import utils

Expand Down
3 changes: 2 additions & 1 deletion app/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@
See here for usage examples:
https://github.com/google/personfinder/wiki/DeveloperFaq
"""
import sys
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure exactly what this is for (?), but it shouldn't be necessary to modify sys.path within our code.

Copy link
Author

Choose a reason for hiding this comment

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

@nworden sys.path was present since directory named handlers and utils were having config.py in it and it was supposed to be imported.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think you can remove the sys import as well.


from google.appengine.ext import db
import UserDict, model, random, simplejson
import logging
import datetime
import utils
#import utils
Copy link
Contributor

Choose a reason for hiding this comment

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

I think you may have accidentally commented this import out.

Copy link
Author

Choose a reason for hiding this comment

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

@nworden have uncommented it in this commit

from datetime import timedelta


Expand Down
0 app/chinese_family_name_dict.txt → app/data/chinese_family_name_dict.txt
View file
Open in desktop
File renamed without changes.
0 app/japanese_name_location_dict.txt → app/data/japanese_name_location_dict.txt
View file
Open in desktop
File renamed without changes.
22 changes: 22 additions & 0 deletions app/locale/af/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,10 @@ msgstr "Vergelyk hierdie rekords"
msgid "Contact information"
msgstr "Kontakinligting"

#, python-format
msgid "Content purported to be compressed with %s but failed to decompress."
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure exactly why, but it looks like messages from files in app/vendors is getting added to the django.po files. That's not necessary -- we only need our own messages in here.

Copy link
Author

Choose a reason for hiding this comment

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

Even am trying to understand how messages are getting added to django.po files. Neither any of regular expression in my code is appending so. What exactly is the ask here ?

Copy link
Contributor

Choose a reason for hiding this comment

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

Please undo the changes you made to these files, we can't pull them into master. If you committed just the django.po file changes by themselves in a particular commit, it might be as easy as running git revert <that commit>.

msgstr ""

msgid "Copy and paste the following HTML code to put this tool on your site"
msgstr ""
"Kopieer en plak die volgende HTML-kode om hierdie nutsding op jou werf te"
Expand Down Expand Up @@ -1278,6 +1282,9 @@ msgstr "Rede waarom notas gedeaktiveer word:"
msgid "Records with names and addresses matching \"%(query)s\""
msgstr "Rekords met name en adresse wat pas by \"%(query)s\""

msgid "Redirected but the response is missing a Location: header."
msgstr ""

msgid "Remove"
msgstr "Verwyder"

Expand Down Expand Up @@ -1418,6 +1425,9 @@ msgstr "Die skrywer het notas oor hierdie rekord gedeaktiveer."
msgid "The author has disabled status updates on this record."
msgstr "Die skrywer het statusopdaterings oor hierdie rekord gedeaktiveer."

msgid "The challenge doesn't contain a server nonce, or this one is empty."
msgstr ""

#, python-format
msgid "The note for %(full_name)s has been added"
msgstr "Die nota vir %(full_name)s is bygevoeg"
Expand Down Expand Up @@ -1565,6 +1575,18 @@ msgstr "URL van oorspronklike rekord"
msgid "Unspecified"
msgstr "Ongespesifiseer"

#, python-format
msgid "Unsupported value for algorithm: %s."
msgstr ""

#, python-format
msgid "Unsupported value for pw-algorithm: %s."
msgstr ""

#, python-format
msgid "Unsupported value for qop: %s."
msgstr ""

msgid "Update an existing key"
msgstr "Dateer 'n bestaande sleutel op"

Expand Down
22 changes: 22 additions & 0 deletions app/locale/am/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,10 @@ msgstr "እነዚህ መዝገቦችን ያወዳድሩ"
msgid "Contact information"
msgstr "የእውቂያ መረጃ"

#, python-format
msgid "Content purported to be compressed with %s but failed to decompress."
msgstr ""

msgid "Copy and paste the following HTML code to put this tool on your site"
msgstr "ይህን መሣሪያ በጣቢያዎ ላይ ለማድረግ የሚከተለውን የኤች ቲ ኤም ኤል ኮድ ገልብጠው ይለጥፉት"

Expand Down Expand Up @@ -1242,6 +1246,9 @@ msgstr "ማስታወሻዎች የሚሰናከሉበት ምክንያት፦"
msgid "Records with names and addresses matching \"%(query)s\""
msgstr "ከ«%(query)s» ጋር የሚዛመዱ ስሞች እና አድራሻዎች ያላቸው መዛግብቶች"

msgid "Redirected but the response is missing a Location: header."
msgstr ""

msgid "Remove"
msgstr "አስወግድ"

Expand Down Expand Up @@ -1382,6 +1389,9 @@ msgstr "ጸሐፊው በዚህ መዝገብ ላይ ማስታወሻዎችን አ
msgid "The author has disabled status updates on this record."
msgstr "ጸሐፊው በዚህ መዝገብ ላይ የሁኔታ ዝማኔዎችን አሰናክሏል።"

msgid "The challenge doesn't contain a server nonce, or this one is empty."
msgstr ""

#, python-format
msgid "The note for %(full_name)s has been added"
msgstr "የ%(full_name)s ማስታወሻ ታክሏል"
Expand Down Expand Up @@ -1525,6 +1535,18 @@ msgstr "የመጀመሪያው መዝገብ ዩአርኤል"
msgid "Unspecified"
msgstr "ያልተገለጸ"

#, python-format
msgid "Unsupported value for algorithm: %s."
msgstr ""

#, python-format
msgid "Unsupported value for pw-algorithm: %s."
msgstr ""

#, python-format
msgid "Unsupported value for qop: %s."
msgstr ""

msgid "Update an existing key"
msgstr "አንድ ነባር ቁልፍ ያዘምኑ"

Expand Down
22 changes: 22 additions & 0 deletions app/locale/ar/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,6 +694,10 @@ msgstr "مقارنة هذه السجلات"
msgid "Contact information"
msgstr "معلومات الاتصال"

#, python-format
msgid "Content purported to be compressed with %s but failed to decompress."
msgstr ""

msgid "Copy and paste the following HTML code to put this tool on your site"
msgstr "‏انسخ رمز HTML التالي والصقه لوضع هذه الأداة على موقعك"

Expand Down Expand Up @@ -1266,6 +1270,9 @@ msgstr "سبب إيقاف الملاحظات:"
msgid "Records with names and addresses matching \"%(query)s\""
msgstr "سجلات تشتمل على أسماء وعناوين تطابق \"%(query)s\""

msgid "Redirected but the response is missing a Location: header."
msgstr ""

msgid "Remove"
msgstr "إزالة"

Expand Down Expand Up @@ -1408,6 +1415,9 @@ msgstr "لقد أوقف المؤلف الملاحظات على هذا السجل
msgid "The author has disabled status updates on this record."
msgstr "لقد أوقف المؤلف تحديثات الحالة على هذا السجل."

msgid "The challenge doesn't contain a server nonce, or this one is empty."
msgstr ""

#, python-format
msgid "The note for %(full_name)s has been added"
msgstr "تمت إضافة الملاحظة لـ %(full_name)s"
Expand Down Expand Up @@ -1551,6 +1561,18 @@ msgstr "‏عنوان URL للسجل الأصلي"
msgid "Unspecified"
msgstr "غير محدد"

#, python-format
msgid "Unsupported value for algorithm: %s."
msgstr ""

#, python-format
msgid "Unsupported value for pw-algorithm: %s."
msgstr ""

#, python-format
msgid "Unsupported value for qop: %s."
msgstr ""

msgid "Update an existing key"
msgstr "تحديث مفتاح حالي"

Expand Down
22 changes: 22 additions & 0 deletions app/locale/az/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,10 @@ msgstr "Bu rekordları müqayisə edin"
msgid "Contact information"
msgstr "Əlaqə məlumatı"

#, python-format
msgid "Content purported to be compressed with %s but failed to decompress."
msgstr ""

msgid "Copy and paste the following HTML code to put this tool on your site"
msgstr ""
"Bu aləti saytınıza yerləşdirmək üçün sonrakı HTML kodunu kopyalayıb "
Expand Down Expand Up @@ -1289,6 +1293,9 @@ msgstr "Notların deaktivləşmə səbəbi:"
msgid "Records with names and addresses matching \"%(query)s\""
msgstr "\"%(query)s\" ilə uyğunlaşan ad və ünvanlarla birlikdə qeydlər"

msgid "Redirected but the response is missing a Location: header."
msgstr ""

msgid "Remove"
msgstr "Sil"

Expand Down Expand Up @@ -1433,6 +1440,9 @@ msgstr "Müəllif bu qeyd ilə əlaqəli notları deaktiv edib."
msgid "The author has disabled status updates on this record."
msgstr "Müəllif bu qeyd ilə əlaqəli status yeniliklərini deaktiv edib."

msgid "The challenge doesn't contain a server nonce, or this one is empty."
msgstr ""

#, python-format
msgid "The note for %(full_name)s has been added"
msgstr "%(full_name)s üçün qeyd əlavə edilib"
Expand Down Expand Up @@ -1579,6 +1589,18 @@ msgstr "Orijinal rekordun URL ünvanı"
msgid "Unspecified"
msgstr "Müəyyənləşməmiş"

#, python-format
msgid "Unsupported value for algorithm: %s."
msgstr ""

#, python-format
msgid "Unsupported value for pw-algorithm: %s."
msgstr ""

#, python-format
msgid "Unsupported value for qop: %s."
msgstr ""

msgid "Update an existing key"
msgstr "Mövcud açarı güncəlləyin"

Expand Down
22 changes: 22 additions & 0 deletions app/locale/bg/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,10 @@ msgstr "Сравняване на тези записи"
msgid "Contact information"
msgstr "Информация за връзка"

#, python-format
msgid "Content purported to be compressed with %s but failed to decompress."
msgstr ""

msgid "Copy and paste the following HTML code to put this tool on your site"
msgstr ""
"Копирайте следния HTML код и го поставете в сайта си, за да сложите този "
Expand Down Expand Up @@ -1290,6 +1294,9 @@ msgstr "Причина за деактивиране на бележките:"
msgid "Records with names and addresses matching \"%(query)s\""
msgstr "Записи с имена и адреси, съответстващи на „%(query)s“"

msgid "Redirected but the response is missing a Location: header."
msgstr ""

msgid "Remove"
msgstr "Премахване"

Expand Down Expand Up @@ -1434,6 +1441,9 @@ msgstr "Авторът е деактивирал бележките за тоз
msgid "The author has disabled status updates on this record."
msgstr "Авторът е деактивирал актуализациите за състоянието за този запис."

msgid "The challenge doesn't contain a server nonce, or this one is empty."
msgstr ""

#, python-format
msgid "The note for %(full_name)s has been added"
msgstr "Бележката за %(full_name)s е добавена"
Expand Down Expand Up @@ -1584,6 +1594,18 @@ msgstr "URL адрес на оригиналния запис"
msgid "Unspecified"
msgstr "Не е посочено"

#, python-format
msgid "Unsupported value for algorithm: %s."
msgstr ""

#, python-format
msgid "Unsupported value for pw-algorithm: %s."
msgstr ""

#, python-format
msgid "Unsupported value for qop: %s."
msgstr ""

msgid "Update an existing key"
msgstr "Актуализиране на съществуващ ключ"

Expand Down
22 changes: 22 additions & 0 deletions app/locale/bn/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,6 +703,10 @@ msgstr "এই রেকর্ডগুলির তুলনা করুন"
msgid "Contact information"
msgstr "যোগাযোগের তথ্য"

#, python-format
msgid "Content purported to be compressed with %s but failed to decompress."
msgstr ""

msgid "Copy and paste the following HTML code to put this tool on your site"
msgstr "আপনার সাইটে এই টুলটি রাখতে নিম্নলিখিত HTML কোডটি কপি করে পেস্ট করুন"

Expand Down Expand Up @@ -1292,6 +1296,9 @@ msgstr "নোটগুলি অক্ষম করার কারণ:"
msgid "Records with names and addresses matching \"%(query)s\""
msgstr "নাম ও ঠিকানাগুলি সহ রেকর্ডগুলি \"%(query)s\" এর সাথে মিলে যাচ্ছে"

msgid "Redirected but the response is missing a Location: header."
msgstr ""

msgid "Remove"
msgstr "সরান"

Expand Down Expand Up @@ -1434,6 +1441,9 @@ msgstr "এই লেখক এই রেকর্ডটির জন্য ন
msgid "The author has disabled status updates on this record."
msgstr "এই লেখক এই রেকর্ডটির জন্য স্থিতি আপডেটগুলি অক্ষম করেছে৷"

msgid "The challenge doesn't contain a server nonce, or this one is empty."
msgstr ""

#, python-format
msgid "The note for %(full_name)s has been added"
msgstr "%(full_name)s এর জন্য নোট যোগ করা হয়েছে"
Expand Down Expand Up @@ -1585,6 +1595,18 @@ msgstr "মূল রেকর্ডের আসল URL টি"
msgid "Unspecified"
msgstr "অনির্দিষ্ট"

#, python-format
msgid "Unsupported value for algorithm: %s."
msgstr ""

#, python-format
msgid "Unsupported value for pw-algorithm: %s."
msgstr ""

#, python-format
msgid "Unsupported value for qop: %s."
msgstr ""

msgid "Update an existing key"
msgstr "একটি বিদ্যমান কী আপডেট করুন"

Expand Down
22 changes: 22 additions & 0 deletions app/locale/ca/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,10 @@ msgstr "Compara aquests registres"
msgid "Contact information"
msgstr "Informació de contacte"

#, python-format
msgid "Content purported to be compressed with %s but failed to decompress."
msgstr ""

msgid "Copy and paste the following HTML code to put this tool on your site"
msgstr ""
"Copieu i enganxeu el codi HTML següent per col·locar aquesta eina al "
Expand Down Expand Up @@ -1299,6 +1303,9 @@ msgstr "Motiu per a la desactivació de les notes:"
msgid "Records with names and addresses matching \"%(query)s\""
msgstr "Registres amb noms i adreces que coincideixin amb \"%(query)s\""

msgid "Redirected but the response is missing a Location: header."
msgstr ""

msgid "Remove"
msgstr "Elimina"

Expand Down Expand Up @@ -1441,6 +1448,9 @@ msgstr "L'autor ha desactivat les notes en aquest registre."
msgid "The author has disabled status updates on this record."
msgstr "L'autor ha desactivat les actualitzacions d'estat en aquest registre."

msgid "The challenge doesn't contain a server nonce, or this one is empty."
msgstr ""

#, python-format
msgid "The note for %(full_name)s has been added"
msgstr "La nota per a %(full_name)s s'ha afegit"
Expand Down Expand Up @@ -1594,6 +1604,18 @@ msgstr "URL del registre original"
msgid "Unspecified"
msgstr "Sense especificar"

#, python-format
msgid "Unsupported value for algorithm: %s."
msgstr ""

#, python-format
msgid "Unsupported value for pw-algorithm: %s."
msgstr ""

#, python-format
msgid "Unsupported value for qop: %s."
msgstr ""

msgid "Update an existing key"
msgstr "Actualitza una clau existent"

Expand Down
Loading