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.

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

Merge main to develop #4997

Open
wants to merge 31 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
b91d155
Merge pull request #4917 from Giveth/develop
mateodaza Jan 2, 2025
98e7456
add cCOP token images
divine-comedian Jan 10, 2025
6e1b2fe
comment out custom sponsors from QF banner
divine-comedian Jan 15, 2025
0c16398
add trump token images
divine-comedian Jan 22, 2025
05639fb
Merge branch 'main' into new_release_vouched_superfluid
kkatusic Jan 27, 2025
e96f3fc
Revert "Merge pull request #4974 from Giveth/fix/project_estimated_va…
kkatusic Jan 27, 2025
b14188d
Revert "Merge pull request #4973 from Giveth/feat/add_estimation_time"
kkatusic Jan 27, 2025
1e51ca7
removing qf
kkatusic Jan 27, 2025
eb4119b
Merge branch 'feat/add_cbbtc_recurring' into new_release_vouched_supe…
kkatusic Jan 27, 2025
fcea3b0
Revert "Merge pull request #4952 from Giveth/add_estimated_timer"
kkatusic Jan 27, 2025
54b8d5f
Revert "Merge pull request #4951 from Giveth/add_estimated_timer"
kkatusic Jan 27, 2025
9f56e0b
removing estimated
kkatusic Jan 27, 2025
7f260a8
fixing error
kkatusic Jan 27, 2025
6f960ae
update amountinput
kkatusic Jan 27, 2025
e6dc66c
Revert "adding matching value to project layouts except matching on …
kkatusic Jan 27, 2025
5edb91f
remove matching
kkatusic Jan 27, 2025
b415fb4
removing matching
kkatusic Jan 27, 2025
b9e59a5
fixing decimals
kkatusic Jan 27, 2025
f667925
fixing base donations
kkatusic Jan 27, 2025
b3dea9b
Merge pull request #4975 from Giveth/new_release_vouched_superfluid
kkatusic Jan 27, 2025
24f27d3
update sponsor logos - loving on PG round
divine-comedian Jan 27, 2025
88b698f
add mux sponsor logo
divine-comedian Jan 28, 2025
b2c485e
update docs links + update hardcoded docs links
divine-comedian Jan 28, 2025
c86f60a
change array order of locales
divine-comedian Jan 28, 2025
b64a9f4
add flex wrapping to eligible donation networks qf
divine-comedian Jan 28, 2025
58df13a
Merge pull request #4983 from Giveth/docs-notion-migration-links
divine-comedian Jan 29, 2025
3fc6dd5
fix height of project card on mobile qf view
divine-comedian Jan 29, 2025
b7678b4
change catalan locale & route to ct from ca
divine-comedian Jan 29, 2025
7429da4
Merge pull request #4987 from Giveth/fix-donate-project-card-mobile-qf
divine-comedian Jan 30, 2025
36da5ea
Merge pull request #4988 from Giveth/stop-canada-in-catalan
divine-comedian Jan 30, 2025
de74cf4
Merge branch 'main' into merge_main_to_develop
kkatusic Jan 31, 2025
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
4 changes: 1 addition & 3 deletions lang/ca.json → lang/ct.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
"component.pro_guide.tips.social_media.item3": "Giveth podria utilitzar els teus noms d'usuari a les xarxes socials per contactar-te o etiquetar-te en publicacions per suportar la teva recaptació de fons.",
"component.qf-section.tooltip": "Aquesta estimació és els fons d'emparellament que aquest projecte rebrà si la ronda acabés ara, sense tenir en compte l'anàlisi de frau.",
"component.qf-section.tooltip_polygon": "Aquesta estimació representa els fons coincidents que rebria aquest projecte si la ronda es tanqués ara, ignorant l'anàlisi del frau.",
"component.qf-section.estimated_time": "Càlcul de coincidència actualitzat fa {time} minuts",
"component.qf_middle_banner.desc": " Amb FQ, el nombre de donants compta més que la quantitat donada. Dona als projectes participants en la ronda i aconsegueix que les teves donacions siguin emparellades amb el poder del finançament quadràtic!",
"component.qf_middle_banner.title": "Finançament Quadràtic",
"component.regenstream_card.harvest_caption": "Utilitza el botó de Recollida per reclamar recompenses líquides d'aquest RegenStream",
Expand Down Expand Up @@ -557,7 +556,6 @@
"label.how_do_you_want_to_donate": "Com vols donar?",
"label.how_it_works": "Com Funciona",
"label.how_it_works?": "Com funciona?",
"label.last_updated_ago": "Última actualització: fa {time} minuts",
"label.how_referrals_work": "Com funcionen les referències",
"label.how_to_buy": "Com comprar",
"label.how_to_refer_your_friends": "Com referir als teus amics",
Expand Down Expand Up @@ -1358,7 +1356,7 @@
"label.you_supported_this_project_with_100%": "Has donat suport a aquest projecte amb el 100% del teu GIVpower total. No pots editar la distribució a menys que tinguis com a mínim un altre projecte impulsat. Prova de boostejar altres projectes o gestionar-los a",
"label.you_will_donate_total": "Donaràs un total de",
"label.zero_gas_fees_straight_to_your_wallet": "Zero tarifes de gas, directe a la teva billetera",
"lang.ca": "Català",
"lang.ct": "Català",
"lang.en": "Inglés",
"lang.es": "Español",
"mental-health": "Salut Mental",
Expand Down
4 changes: 1 addition & 3 deletions lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
"component.pro_guide.tips.social_media.item3": "Giveth might use your social media handles to contact you or tag you on posts to support your fundraising.",
"component.qf-section.tooltip": "This estimation is the matching funds that this project would get if the round ended now, disregarding fraud analysis.",
"component.qf-section.tooltip_polygon": "This estimate represents the matching funds this project would receive if the round closed now, ignoring the fraud analysis.",
"component.qf-section.estimated_time": "Estimated matching updated {time} min ago",
"component.qf_middle_banner.desc": "With QF, the number of donors matters more than the amout donated. Donate to participating projects in the round and get your donations matched with the power of quadratic funding!",
"component.qf_middle_banner.title": "Quadratic Funding",
"component.regenstream_card.harvest_caption": "Use the Harvest button to claim liquid rewards from this RegenStream",
Expand Down Expand Up @@ -557,7 +556,6 @@
"label.how_do_you_want_to_donate": "How do you want to donate?",
"label.how_it_works": "How It Works",
"label.how_it_works?": "How it works?",
"label.last_updated_ago": "Last updated: {time} min ago",
"label.how_referrals_work": "How referrals work",
"label.how_to_buy": "How to buy",
"label.how_to_refer_your_friends": "How to refer your friends",
Expand Down Expand Up @@ -1358,7 +1356,7 @@
"label.you_supported_this_project_with_100%": "You supported this project with 100% of your total GIVpower. You can't edit the allocation unless you have at least 1 other boosted project. Try boosting other projects or managing them in",
"label.you_will_donate_total": "You will donate a total of",
"label.zero_gas_fees_straight_to_your_wallet": "Zero Gas Fees, Straight To Your Wallet",
"lang.ca": "Catalan",
"lang.ct": "Catalan",
"lang.en": "English",
"lang.es": "Spanish",
"mental-health": "Mental Health",
Expand Down
4 changes: 1 addition & 3 deletions lang/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
"component.pro_guide.tips.social_media.item3": "Giveth podría usar tus identificadores de redes sociales para contactarte o etiquetarte en publicaciones para apoyar tu recaudación de fondos.",
"component.qf-section.tooltip": "Esta estimación es la cantidad de fondos complementarios que este proyecto recibiría si la ronda terminara ahora, sin tener en cuenta el análisis de fraude.",
"component.qf-section.tooltip_polygon": "Esta estimación representa los fondos de contrapartida que recibiría este proyecto si la ronda se cerrara ahora, ignorando el análisis de fraude.",
"component.qf-section.estimated_time": "Cálculo de coincidencias actualizado hace {time} minutos",
"component.qf_middle_banner.desc": "Con FC, el número de donantes importa más que la cantidad donada. ¡Dona a los proyectos participantes en la ronda y obtén tus donaciones emparejadas con el poder de la financiación cuadrática!",
"component.qf_middle_banner.title": "Financiación Cuadrática",
"component.regenstream_card.harvest_caption": "Utiliza el botón de Cosecha para reclamar recompensas líquidas de este RegenStream",
Expand Down Expand Up @@ -555,7 +554,6 @@
"label.how_do_you_want_to_donate": "¿Cómo quieres donar?",
"label.how_it_works": "Cómo Funciona",
"label.how_it_works?": "¿Cómo funciona?",
"label.last_updated_ago": "Última actualización: hace {time} minutos",
"label.how_referrals_work": "Cómo funcionan las referencias",
"label.how_to_buy": "Cómo comprar",
"label.how_to_refer_your_friends": "Como referir a tus amigos",
Expand Down Expand Up @@ -1358,7 +1356,7 @@
"label.you_supported_this_project_with_100%": "Has apoyado este proyecto con el 100% de tu GIVpower total. No puedes editar la asignación a menos que tengas al menos otro proyecto boosteado. Intenta boostear otros proyectos o gestionarlos en",
"label.you_will_donate_total": "Donarás un total de",
"label.zero_gas_fees_straight_to_your_wallet": "Cero Tarifas de Gas, Directo a tu Billetera",
"lang.ca": "Catalán",
"lang.ct": "Catalán",
"lang.en": "Inglés",
"lang.es": "Español",
"mental-health": "Salud Mental",
Expand Down
8 changes: 4 additions & 4 deletions lang/find.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ const en = JSON.parse(enJsonData);
const esJsonData = fs.readFileSync('es.json');
const es = JSON.parse(esJsonData);

const caJsonData = fs.readFileSync('ca.json');
const ca = JSON.parse(caJsonData);
const ctJsonData = fs.readFileSync('ct.json');
const ct = JSON.parse(ctJsonData);

function findSameKeyValue(obj) {
const sameKeyValue = {};
Expand All @@ -28,7 +28,7 @@ function save(obj, name) {
}

const ntEs = findSameKeyValue(es);
const ntCa = findSameKeyValue(ca);
const ntCt = findSameKeyValue(ct);

save(ntEs, 'nt_es.json');
save(ntCa, 'nt_ca.json');
save(ntCt, 'nt_ca.json');
kkatusic marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions lang/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ca from './ca.json';
import ct from './ct.json';
import en from './en.json';
import es from './es.json';

export { ca, en, es };
export { ct, en, es };
18 changes: 9 additions & 9 deletions lang/translate.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ async function FillSpanishJsonFile() {
const esJsonData = fs.readFileSync('es.json');
const es = JSON.parse(esJsonData);

// const caJsonData = fs.readFileSync('ca.json');
// const ca = JSON.parse(caJsonData);
// const ctJsonData = fs.readFileSync('ca.json');
// const ca = JSON.parse(ctJsonData);

for (const key in es) {
if (Object.hasOwnProperty.call(es, key)) {
Expand All @@ -68,20 +68,20 @@ async function FillCatalanJsonFile() {
const enJsonData = fs.readFileSync('en.json');
const en = JSON.parse(enJsonData);

const caJsonData = fs.readFileSync('ca.json');
const ca = JSON.parse(caJsonData);
const ctJsonData = fs.readFileSync('ct.json');
const ct = JSON.parse(ctJsonData);

for (const key in ca) {
if (Object.hasOwnProperty.call(ca, key)) {
const value = ca[key];
for (const key in ct) {
if (Object.hasOwnProperty.call(ct, key)) {
const value = ct[key];
if (value === '') {
console.log(key, en[key]);
ca[key] = await translate(en[key], 'Catalan');
ct[key] = await translate(en[key], 'Catalan');
}
}
}

save(ca, 'ca.json');
save(ct, 'ct.json');
}

FillSpanishJsonFile();
Expand Down
14 changes: 7 additions & 7 deletions lang/update.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ const en = JSON.parse(enJsonData);
const esJsonData = fs.readFileSync('es.json');
const es = JSON.parse(esJsonData);

const caJsonData = fs.readFileSync('ca.json');
const ca = JSON.parse(caJsonData);
const ctJsonData = fs.readFileSync('ct.json');
const ct = JSON.parse(ctJsonData);

function sort(data) {
// Convert object to array of key-value pairs
Expand Down Expand Up @@ -72,18 +72,18 @@ function removeExtraKeys(obj) {
}

const filteredEs = removeExtraKeys(es);
const filteredCa = removeExtraKeys(ca);
const filteredCt = removeExtraKeys(ct);

const updatedEs = addMissingKeys(filteredEs);
const updatedCa = addMissingKeys(filteredCa);
const updatedCt = addMissingKeys(filteredCt);

const sortedEn = sort(en);
const sortedEs = sort(updatedEs);
const sortedCa = sort(updatedCa);
const sortedCt = sort(updatedCt);

const filledEs = fillEmptyValues(sortedEs);
const filledCa = fillEmptyValues(sortedCa);
const filledCt = fillEmptyValues(sortedCt);

save(sortedEn, 'en.json');
save(filledEs, 'es.json');
save(filledCa, 'ca.json');
save(filledCt, 'ct.json');
2 changes: 1 addition & 1 deletion next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const withBundleAnalyzer = require('@next/bundle-analyzer')({
const generateRobotsTxt = require('./scripts/generate-robots-txt');

const defaultLocale = 'en';
const locales = ['ca', 'en', 'es'];
const locales = ['en', 'ct', 'es'];

const moduleExports = withBundleAnalyzer({
// Your existing module.exports
Expand Down
4 changes: 2 additions & 2 deletions pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import { HeaderWrapper } from '@/components/Header/HeaderWrapper';
import { FooterWrapper } from '@/components/Footer/FooterWrapper';
import '../styles/globals.css';
import { ca, en, es } from '../lang';
import { ct, en, es } from '../lang';
kkatusic marked this conversation as resolved.
Show resolved Hide resolved
import { store } from '@/features/store';
import SubgraphController from '@/components/controller/subgraph.ctrl';
import UserController from '@/components/controller/user.ctrl';
Expand Down Expand Up @@ -59,7 +59,7 @@
const queryClient = new QueryClient();

export const IntlMessages = {
ca,
ct,
en,
es,
};
Expand Down Expand Up @@ -125,7 +125,7 @@
!isBypassingMaintenance;

useEffect(() => {
const handleStart = (url: string) => {

Check warning on line 128 in pages/_app.tsx

View workflow job for this annotation

GitHub Actions / build

'url' is defined but never used. Allowed unused args must match /^_/u
NProgress.start();
};
const handleChangeComplete = (url: string) => {
Expand Down Expand Up @@ -182,7 +182,7 @@
}
};
asyncFunc();
}, []);

Check warning on line 185 in pages/_app.tsx

View workflow job for this annotation

GitHub Actions / build

React Hook useEffect has missing dependencies: 'asPath', 'pathname', 'query', and 'router'. Either include them or remove the dependency array

return (
<>
Expand Down
Loading
Loading